diff --git a/app/assets/javascripts/app/controllers/lockScreen.js b/app/assets/javascripts/app/controllers/lockScreen.js
index ffd4e88ae..72927f7fd 100644
--- a/app/assets/javascripts/app/controllers/lockScreen.js
+++ b/app/assets/javascripts/app/controllers/lockScreen.js
@@ -14,6 +14,9 @@ class LockScreen {
     $scope.formData = {};
 
     $scope.submitPasscodeForm = function() {
+      if(!$scope.formData.passcode || $scope.formData.passcode.length == 0) {
+        return;
+      }
       passcodeManager.unlock($scope.formData.passcode, (success) => {
         if(!success) {
           alert("Invalid passcode. Please try again.");
diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss
index 533372a11..e07ea1e77 100644
--- a/app/assets/stylesheets/app/_editor.scss
+++ b/app/assets/stylesheets/app/_editor.scss
@@ -62,7 +62,7 @@ $heading-height: 75px;
     text-align: right;
     color: rgba(black, 0.23);
 
-    .error {
+    &.error, .error {
       color: #f6a200;
     }
   }
diff --git a/app/assets/templates/directives/actions-menu.html.haml b/app/assets/templates/directives/actions-menu.html.haml
index 9fe6397b1..18bd4fae0 100644
--- a/app/assets/templates/directives/actions-menu.html.haml
+++ b/app/assets/templates/directives/actions-menu.html.haml
@@ -19,6 +19,8 @@
           %strong {{action.access_type}}
           access to this note.
 
+      %menu-row{"ng-if" => "extension.actionsWithContextForItem(item).length == 0", "label" => "'No Actions Available'", "faded" => "true"}
+
 
 .modal.medium-text.medium{"ng-if" => "renderData.showRenderModal", "ng-click" => "$event.stopPropagation();"}
   .content