Double-click triggering edit mode redundantly+issues

Double-click triggering edit mode when already in edit mode.