diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
index bbf5c2354..cffd903c7 100644
--- a/app/assets/javascripts/app/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -23,7 +23,7 @@ angular.module('app')
     }
   })
   .controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, actionsManager, syncManager, modelManager, themeManager, componentManager, storageManager, sessionHistory) {
-    
+
     this.spellcheck = true;
     this.componentManager = componentManager;
 
@@ -366,11 +366,10 @@ angular.module('app')
       this.editingName = false;
     }
 
-    this.selectedMenuItem = function($event, hide) {
+    this.selectedMenuItem = function(hide) {
       if(hide) {
         this.showMenu = false;
       }
-      $event.stopPropagation();
     }
 
     this.deleteNote = function() {
diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js
index 1ab060248..1c33e0d1b 100644
--- a/app/assets/javascripts/app/controllers/notes.js
+++ b/app/assets/javascripts/app/controllers/notes.js
@@ -282,7 +282,7 @@ angular.module('app')
       }.bind(this), 100)
     }
 
-    this.selectedMenuItem = function($event) {
+    this.selectedMenuItem = function() {
       this.showMenu = false;
     }
 
diff --git a/app/assets/javascripts/app/directives/views/actionsMenu.js b/app/assets/javascripts/app/directives/views/actionsMenu.js
index 62cfece78..261de3f43 100644
--- a/app/assets/javascripts/app/directives/views/actionsMenu.js
+++ b/app/assets/javascripts/app/directives/views/actionsMenu.js
@@ -61,9 +61,8 @@ class ActionsMenu {
       }
       return parentAction.subactions.map((subaction) => {
         return {
-          onClick: ($event) => {
+          onClick: () => {
             this.executeAction(subaction, extension, parentAction);
-            $event.stopPropagation();
           },
           label: subaction.label,
           subtitle: subaction.desc,
diff --git a/app/assets/javascripts/app/directives/views/editorMenu.js b/app/assets/javascripts/app/directives/views/editorMenu.js
index 02c5b505f..9c566a097 100644
--- a/app/assets/javascripts/app/directives/views/editorMenu.js
+++ b/app/assets/javascripts/app/directives/views/editorMenu.js
@@ -22,8 +22,7 @@ class EditorMenu {
 
     $scope.defaultEditor = $scope.editors.filter((e) => {return e.isDefaultEditor()})[0];
 
-    $scope.selectComponent = function($event, component) {
-      $event.stopPropagation();
+    $scope.selectComponent = function(component) {
       if(component) {
         component.conflict_of = null; // clear conflict if applicable
       }
diff --git a/app/assets/javascripts/app/directives/views/menuRow.js b/app/assets/javascripts/app/directives/views/menuRow.js
index cb6c791e7..999e64f9f 100644
--- a/app/assets/javascripts/app/directives/views/menuRow.js
+++ b/app/assets/javascripts/app/directives/views/menuRow.js
@@ -5,6 +5,7 @@ class MenuRow {
     this.transclude = true;
     this.templateUrl = "directives/menu-row.html";
     this.scope = {
+      action: "&",
       circle: "=",
       label: "=",
       subtitle: "=",
@@ -15,14 +16,27 @@ class MenuRow {
       spinnerClass: "=",
       subRows: "=",
       faded: "=",
-      desc: "="
+      desc: "=",
+      disabled: "="
     };
   }
 
   controller($scope, componentManager) {
     'ngInject';
 
+    $scope.onClick = function($event) {
+      if($scope.disabled) {
+        return;
+      }
+      $event.stopPropagation();
+      $scope.action();
+    }
+
+    // This is for the accessory button
     $scope.clickButton = function($event) {
+      if($scope.disabled) {
+        return;
+      }
       $event.stopPropagation();
       $scope.buttonAction();
     }
diff --git a/app/assets/templates/directives/actions-menu.html.haml b/app/assets/templates/directives/actions-menu.html.haml
index 3596b7e92..cf0b7fffe 100644
--- a/app/assets/templates/directives/actions-menu.html.haml
+++ b/app/assets/templates/directives/actions-menu.html.haml
@@ -12,7 +12,7 @@
           %div{"ng-if" => "extension.hide"} …
 
       %menu-row{"ng-if" => "!extension.hide", "ng-repeat" => "action in extension.actionsWithContextForItem(item)",
-      "ng-click" => "executeAction(action, extension); $event.stopPropagation();", "label" => "action.label", "subtitle" => "action.desc",
+      "action" => "executeAction(action, extension);", "label" => "action.label", "subtitle" => "action.desc",
       "spinner-class" => "action.running ? 'info' : null", "sub-rows" => "action.subrows"}
         .sublabel{"ng-if" => "action.access_type"}
           Uses
diff --git a/app/assets/templates/directives/editor-menu.html.haml b/app/assets/templates/directives/editor-menu.html.haml
index 0a7c544df..9d6ce6df9 100644
--- a/app/assets/templates/directives/editor-menu.html.haml
+++ b/app/assets/templates/directives/editor-menu.html.haml
@@ -3,9 +3,9 @@
     .section
       .header
         %h4.title Note Editor
-      %menu-row{"label" => "'Plain Editor'", "circle" => "selectedEditor == null && 'success'", "ng-click" => "selectComponent($event, null)"}
+      %menu-row{"label" => "'Plain Editor'", "circle" => "selectedEditor == null && 'success'", "action" => "selectComponent(null)"}
 
-      %menu-row{"ng-repeat" => "editor in editors", "ng-click" => "selectComponent($event, editor)", "label" => "editor.name",
+      %menu-row{"ng-repeat" => "editor in editors", "action" => "selectComponent(editor)", "label" => "editor.name",
       "circle" => "selectedEditor === editor && 'success'",
        "has-button" => "selectedEditor == editor || defaultEditor == editor", "button-text" => "defaultEditor == editor ? 'Undefault' : 'Set Default'",
        "button-action" => "toggleDefaultForEditor(editor)", "button-class" => "defaultEditor == editor ? 'warning' : 'info'"}
@@ -19,7 +19,7 @@
     .section{"ng-if" => "stack.length > 0"}
       .header
         %h4.title Editor Stack
-      %menu-row{"ng-repeat" => "component in stack", "ng-click" => "selectComponent($event, component)", "label" => "component.name",
+      %menu-row{"ng-repeat" => "component in stack", "action" => "selectComponent(component)", "label" => "component.name",
       "circle" => "stackComponentEnabled(component) ? 'success' : 'danger'"}
         .column{"ng-if" => "component.conflict_of || shouldDisplayRunningLocallyLabel(component)"}
           %strong.red.medium-text{"ng-if" => "component.conflict_of"} Conflicted copy
diff --git a/app/assets/templates/directives/menu-row.html.haml b/app/assets/templates/directives/menu-row.html.haml
index 970b6f723..0cb3cf604 100644
--- a/app/assets/templates/directives/menu-row.html.haml
+++ b/app/assets/templates/directives/menu-row.html.haml
@@ -1,16 +1,16 @@
-.row{"ng-attr-title" => "{{desc}}"}
+.row{"ng-attr-title" => "{{desc}}", "ng-click" => "onClick($event)"}
   .column
     .left
       .column{"ng-if" => "circle"}
         .circle.small{"ng-class" => "circle"}
-      .column{"ng-class" => "{'faded' : faded}"}
+      .column{"ng-class" => "{'faded' : faded || disabled}"}
         .label
           {{label}}
         .sublabel{"ng-if" => "subtitle"}
           {{subtitle}}
         %ng-transclude
     .subrows{"ng-if" => "subRows && subRows.length > 0"}
-      %menu-row{"ng-repeat" => "row in subRows", "ng-click" => "row.onClick($event); $event.stopPropagation();",
+      %menu-row{"ng-repeat" => "row in subRows", "action" => "row.onClick()",
       "label" => "row.label", "subtitle" => "row.subtitle", "spinner-class" => "row.spinnerClass"}
 
   .column{"ng-if" => "hasButton"}
diff --git a/app/assets/templates/directives/session-history-menu.html.haml b/app/assets/templates/directives/session-history-menu.html.haml
index 244ee9ba6..9625f79c5 100644
--- a/app/assets/templates/directives/session-history-menu.html.haml
+++ b/app/assets/templates/directives/session-history-menu.html.haml
@@ -7,17 +7,17 @@
         %a Options
 
     %div{"ng-if" => "showOptions"}
-      %menu-row{"label" => "'Clear note local history'", "ng-click" => "clearItemHistory(); $event.stopPropagation();"}
-      %menu-row{"label" => "'Clear all local history'", "ng-click" => "clearAllHistory(); $event.stopPropagation();"}
-      %menu-row{"label" => "(autoOptimize ? 'Disable' : 'Enable') + ' auto cleanup'", "ng-click" => "toggleAutoOptimize(); $event.stopPropagation();"}
+      %menu-row{"label" => "'Clear note local history'", "action" => "clearItemHistory()"}
+      %menu-row{"label" => "'Clear all local history'", "action" => "clearAllHistory()"}
+      %menu-row{"label" => "(autoOptimize ? 'Disable' : 'Enable') + ' auto cleanup'", "action" => "toggleAutoOptimize()"}
         .sublabel
           Automatically cleans up small revisions to conserve space.
-      %menu-row{"label" => "(diskEnabled ? 'Disable' : 'Enable') + ' saving history to disk'", "ng-click" => "toggleDiskSaving(); $event.stopPropagation();"}
+      %menu-row{"label" => "(diskEnabled ? 'Disable' : 'Enable') + ' saving history to disk'", "action" => "toggleDiskSaving()"}
         .sublabel
           Saving to disk may increase app loading time and memory footprint.
 
     %menu-row{"ng-repeat" => "revision in history.entries",
-      "ng-click" => "openRevision(revision); $event.stopPropagation();",
+      "action" => "openRevision(revision);",
       "label" => "revision.previewTitle()"}
       .sublabel.opaque{"ng-class" => "classForRevision(revision)"}
         {{revision.previewSubTitle()}}
diff --git a/app/assets/templates/editor.html.haml b/app/assets/templates/editor.html.haml
index 5a822c08a..b52370789 100644
--- a/app/assets/templates/editor.html.haml
+++ b/app/assets/templates/editor.html.haml
@@ -31,16 +31,20 @@
             .section
               .header
                 %h4.title Note Options
-              %menu-row{"label" => "ctrl.note.pinned ? 'Unpin' : 'Pin'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.togglePin()", "desc" => "'Pin or unpin a note from the top of your list'"}
-              %menu-row{"label" => "ctrl.note.archived ? 'Unarchive' : 'Archive'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.toggleArchiveNote()", "desc" => "'Archive or unarchive a note from your Archived system tag'"}
-              %menu-row{"label" => "ctrl.note.locked ? 'Unlock' : 'Lock'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.toggleLockNote()", "desc" => "'Locking notes prevents unintentional editing'"}
-              %menu-row{"label" => "'Delete'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.deleteNote()", "desc" => "'Delete this note permanently from all your devices'"}
+              %menu-row{"label" => "ctrl.note.pinned ? 'Unpin' : 'Pin'", "action" => "ctrl.selectedMenuItem(true); ctrl.togglePin()", "desc" => "'Pin or unpin a note from the top of your list'"}
+              %menu-row{"label" => "ctrl.note.archived ? 'Unarchive' : 'Archive'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleArchiveNote()", "desc" => "'Archive or unarchive a note from your Archived system tag'"}
+              %menu-row{"label" => "ctrl.note.locked ? 'Unlock' : 'Lock'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleLockNote()", "desc" => "'Locking notes prevents unintentional editing'"}
+              %menu-row{"label" => "'Delete'", "action" => "ctrl.selectedMenuItem(); ctrl.deleteNote()", "desc" => "'Delete this note permanently from all your devices'"}
 
-            .section{"ng-if" => "!ctrl.selectedEditor"}
+            .section
               .header
                 %h4.title Global Display
-              %menu-row{"label" => "'Monospace Font'", "circle" => "ctrl.monospaceFont ? 'success' : 'default'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.toggleKey('monospaceFont')", "desc" => "'Toggles the font style for the default editor'"}
-              %menu-row{"label" => "'Spellcheck'", "circle" => "ctrl.spellcheck ? 'success' : 'default'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.toggleKey('spellcheck')", "desc" => "'Toggles spellcheck for the default editor'"}
+
+              %menu-row{"label" => "'Monospace Font'", "circle" => "ctrl.monospaceFont ? 'success' : 'default'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleKey('monospaceFont')",
+                "desc" => "'Toggles the font style for the default editor'", "subtitle" => "ctrl.selectedEditor ? 'Not available with editor extensions' : null", "disabled" => "ctrl.selectedEditor"}
+
+              %menu-row{"label" => "'Spellcheck'", "circle" => "ctrl.spellcheck ? 'success' : 'default'", "action" => "ctrl.selectedMenuItem(true); ctrl.toggleKey('spellcheck')",
+                "desc" => "'Toggles spellcheck for the default editor'", "subtitle" => "ctrl.selectedEditor ? 'Not available with editor extensions' : null", "disabled" => "ctrl.selectedEditor"}
 
         .item{"ng-click" => "ctrl.onEditorMenuClick()", "ng-class" => "{'selected' : ctrl.showEditorMenu}", "click-outside" => "ctrl.showEditorMenu = false;", "is-open" => "ctrl.showEditorMenu"}
           .label Editor
diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml
index ec2eebc92..07b625be4 100644
--- a/app/assets/templates/notes.html.haml
+++ b/app/assets/templates/notes.html.haml
@@ -26,19 +26,19 @@
                 .header
                   %h4.title Sort By
 
-                %menu-row{"label" => "'Date Added'", "circle" => "ctrl.sortBy == 'created_at' && 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.selectedSortByCreated()", "desc" => "'Sort notes by newest first'"}
-                %menu-row{"label" => "'Date Modified'", "circle" => "ctrl.sortBy == 'client_updated_at' && 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.selectedSortByUpdated()", "desc" => "'Sort notes with the most recently updated first'"}
-                %menu-row{"label" => "'Title'", "circle" => "ctrl.sortBy == 'title' && 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.selectedSortByTitle()", "desc" => "'Sort notes alphabetically by their title'"}
+                %menu-row{"label" => "'Date Added'", "circle" => "ctrl.sortBy == 'created_at' && 'success'", "action" => "ctrl.selectedMenuItem(); ctrl.selectedSortByCreated()", "desc" => "'Sort notes by newest first'"}
+                %menu-row{"label" => "'Date Modified'", "circle" => "ctrl.sortBy == 'client_updated_at' && 'success'", "action" => "ctrl.selectedMenuItem(); ctrl.selectedSortByUpdated()", "desc" => "'Sort notes with the most recently updated first'"}
+                %menu-row{"label" => "'Title'", "circle" => "ctrl.sortBy == 'title' && 'success'", "action" => "ctrl.selectedMenuItem(); ctrl.selectedSortByTitle()", "desc" => "'Sort notes alphabetically by their title'"}
 
               .section{"ng-if" => "!ctrl.tag.isSmartTag()"}
                 .header
                   %h4.title Display
 
-                %menu-row{"label" => "'Archived Notes'", "circle" => "ctrl.showArchived ? 'success' : 'danger'", "faded" => "!ctrl.showArchived", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('showArchived')", "desc" => "'Archived notes are usually hidden. You can explicitly show them with this option.'"}
-                %menu-row{"label" => "'Pinned Notes'", "circle" => "ctrl.hidePinned ? 'danger' : 'success'", "faded" => "ctrl.hidePinned", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hidePinned')", "desc" => "'Pinned notes always appear on top. You can hide them temporarily with this option so you can focus on other notes in the list.'"}
-                %menu-row{"label" => "'Note Preview'", "circle" => "ctrl.hideNotePreview ? 'danger' : 'success'", "faded" => "ctrl.hideNotePreview", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideNotePreview')", "desc" => "'Hide the note preview for a more condensed list of notes'"}
-                %menu-row{"label" => "'Date'", "circle" => "ctrl.hideDate ? 'danger' : 'success'","faded" => "ctrl.hideDate", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideDate')", "desc" => "'Hide the date displayed in each row'"}
-                %menu-row{"label" => "'Tags'", "circle" => "ctrl.hideTags ? 'danger' : 'success'","faded" => "ctrl.hideTags", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideTags')", "desc" => "'Hide the list of tags associated with each note'"}
+                %menu-row{"label" => "'Archived Notes'", "circle" => "ctrl.showArchived ? 'success' : 'danger'", "faded" => "!ctrl.showArchived", "action" => "ctrl.selectedMenuItem(); ctrl.toggleKey('showArchived')", "desc" => "'Archived notes are usually hidden. You can explicitly show them with this option.'"}
+                %menu-row{"label" => "'Pinned Notes'", "circle" => "ctrl.hidePinned ? 'danger' : 'success'", "faded" => "ctrl.hidePinned", "action" => "ctrl.selectedMenuItem(); ctrl.toggleKey('hidePinned')", "desc" => "'Pinned notes always appear on top. You can hide them temporarily with this option so you can focus on other notes in the list.'"}
+                %menu-row{"label" => "'Note Preview'", "circle" => "ctrl.hideNotePreview ? 'danger' : 'success'", "faded" => "ctrl.hideNotePreview", "action" => "ctrl.selectedMenuItem(); ctrl.toggleKey('hideNotePreview')", "desc" => "'Hide the note preview for a more condensed list of notes'"}
+                %menu-row{"label" => "'Date'", "circle" => "ctrl.hideDate ? 'danger' : 'success'","faded" => "ctrl.hideDate", "action" => "ctrl.selectedMenuItem(); ctrl.toggleKey('hideDate')", "desc" => "'Hide the date displayed in each row'"}
+                %menu-row{"label" => "'Tags'", "circle" => "ctrl.hideTags ? 'danger' : 'success'","faded" => "ctrl.hideTags", "action" => "ctrl.selectedMenuItem(); ctrl.toggleKey('hideTags')", "desc" => "'Hide the list of tags associated with each note'"}
 
 
     .scrollable