diff --git a/www/md_base/src/app/common/directives/panel/panel.tpl.jade b/www/md_base/src/app/common/directives/panel/panel.tpl.jade
index c02568943f3..df011a854ed 100644
--- a/www/md_base/src/app/common/directives/panel/panel.tpl.jade
+++ b/www/md_base/src/app/common/directives/panel/panel.tpl.jade
@@ -1,6 +1,6 @@
 div.inner-container
   div.title-bar(layout="row")
-    div.title(flex, ng-class="{locked: panel.locked}") {{ panel.title }}
+    div.title.no-select(flex, ng-class="{locked: panel.locked}") {{ panel.title }}
     div.buttons(ng-if="!panel.locked")
       md-button(ng-click="panel.toggleCollapse()")
         md-icon(md-svg-icon="expand-panel", ng-show="panel.isCollapsed")
diff --git a/www/md_base/src/app/home/home.controller.coffee b/www/md_base/src/app/home/home.controller.coffee
index fe8aaafd663..daa4bf854e5 100644
--- a/www/md_base/src/app/home/home.controller.coffee
+++ b/www/md_base/src/app/home/home.controller.coffee
@@ -21,6 +21,6 @@ class Home extends Controller
 
     edit_panels: (state) ->
         @editing_panels = state
-        @sortable_settings.disabled = state
+        @sortable_settings.disabled = !state
         @settings.lock_panels.value = !state
         @bbSettingsService.save()