diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
index 5cb7a9c75..d07315429 100644
--- a/notebook/static/base/js/dialog.js
+++ b/notebook/static/base/js/dialog.js
@@ -118,8 +118,10 @@ define(function(require) {
         if (options.keyboard_manager) {
             options.keyboard_manager.disable();
         }
-
-        options.backdrop = options.backdrop || 'static';
+        
+        if(options.backdrop === undefined){
+          options.backdrop = 'static';
+        }
         
         return modal.modal(options);
     };
diff --git a/notebook/static/notebook/js/commandpalette.js b/notebook/static/notebook/js/commandpalette.js
index 52f5ed9ee..abde408ed 100644
--- a/notebook/static/notebook/js/commandpalette.js
+++ b/notebook/static/notebook/js/commandpalette.js
@@ -81,8 +81,7 @@ define(function(require){
               // click on button trigger de-focus on mouse up.
               // or somethign like that.
               setTimeout(function(){input.focus();}, 100);
-        })
-        .on("hide.bs.modal", before_close);
+        });
 
         notebook.keyboard_manager.disable();
 
@@ -98,12 +97,15 @@ define(function(require){
             cell.select();
           }
           if (notebook.keyboard_manager) {
+            console.info('reanable command mode');
             notebook.keyboard_manager.enable();
             notebook.keyboard_manager.command_mode();
           }
           before_close.ok = true; // avoid double call.
         };
         
+        mod.on("hide.bs.modal", before_close);
+        
 
         // will be trigger when user select action
         var onSubmit = function(node, query, result, resultCount) {
diff --git a/notebook/static/notebook/js/searchandreplace.js b/notebook/static/notebook/js/searchandreplace.js
index 7e6b367fb..54b5ffe76 100644
--- a/notebook/static/notebook/js/searchandreplace.js
+++ b/notebook/static/notebook/js/searchandreplace.js
@@ -97,7 +97,7 @@ define(function(require){
   };
   
   // main function
-  var snr = function(env){
+  var snr = function(env) {
     var search  = $("<input/>")
       .addClass('form-control')
       .attr('placeholder','Search');
@@ -291,7 +291,9 @@ define(function(require){
         handler: snr
     };
     
-    keyboard_manager.actions.register(snr, 'search-and-replace-dialog', 'ipython');
+    var act = keyboard_manager.actions.register(snr, 'search-and-replace-dialog', 'ipython');
+    
+    keyboard_manager.command_shortcuts.add_shortcut('Shift-F', act) 
     
   };
   
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 4a3bbfa9c..268b50672 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -328,6 +328,6 @@ data-notebook-path="{{notebook_path}}"
 
 <script src="{{ static_url("components/text-encoding/lib/encoding.js") }}" charset="utf-8"></script>
 
-<script src="{{ static_url("notebook/js/main.js") }}" charset="utf-8"></script>
+<script src="{{ static_url("notebook/js/main.min.js") }}" charset="utf-8"></script>
 
 {% endblock %}
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 42c136dfe..95dee7186 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -24,7 +24,7 @@
           {% endif %}
           baseUrl: '{{static_url("", include_version=False)}}',
           paths: {
-            'auth/js/main': 'auth/js/main',
+            'auth/js/main': 'auth/js/main.min',
             custom : '{{ base_url }}custom',
             nbextensions : '{{ base_url }}nbextensions',
             widgets : '{{ base_url }}deprecatedwidgets',