diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index c611f8e41..628561489 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -658,6 +658,8 @@ class ComponentManager {
               }
             }, 10);
           }
+        } else {
+          this.activateComponent(component);
         }
       }
     }
diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml
index cdccad9e2..1053c5038 100644
--- a/app/assets/templates/notes.html.haml
+++ b/app/assets/templates/notes.html.haml
@@ -4,7 +4,7 @@
       .padded
         .section-title-bar-header
           .title {{ctrl.panelTitle()}}
-          .sk-button.contrast.wide{"ng-click" => "ctrl.createNewNote()", "title" => "Create a new note in the selected tag"}
+          .sk-button.sk-secondary.wide{"ng-click" => "ctrl.createNewNote()", "title" => "Create a new note in the selected tag"}
             .sk-label +
         .filter-section{"role" => "search"}
           %input.filter-bar#search-bar.mousetrap{"select-on-click" => "true", "ng-model" => "ctrl.noteFilter.text", "placeholder" => "Search",