Revert "Removed No Selection Bug"

This reverts commit 6359989d6c41f19fa90fdccddd999d9dc6acc533.