diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index cfd37b636..c3f6c3816 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -87,6 +87,16 @@ var IPython = (function (IPython) {
             var new_margin = splitter_width + left_panel_width;
             $('div#notebook_panel').animate({marginLeft : new_margin + 'px'}, 'fast');
         });
+
+        $(window).bind('beforeunload', function () {
+            var kill_kernel = $('#kill_kernel').prop('checked');
+            if (kill_kernel) {
+                that.kernel.kill();
+                return "You are about to exit this notebook and kill the kernel.";
+            } else {
+                return "You are about the exit this notebook and leave the kernel running.";
+            };
+        });
     };
 
 
diff --git a/IPython/frontend/html/notebook/static/js/savewidget.js b/IPython/frontend/html/notebook/static/js/savewidget.js
index c422333d6..bf0e22e0b 100644
--- a/IPython/frontend/html/notebook/static/js/savewidget.js
+++ b/IPython/frontend/html/notebook/static/js/savewidget.js
@@ -32,17 +32,6 @@ var IPython = (function (IPython) {
         this.element.find('button#save_notebook').click(function () {
             IPython.notebook.save_notebook();
         });
-
-        $(window).bind('beforeunload', function () {
-            var kill_kernel = $('#kill_kernel').prop('checked');
-            IPython.notebook.save_notebook();
-            if (kill_kernel) {
-                IPython.notebook.kernel.kill();
-                return "You are about to exit this notebook and kill the kernel.";
-            } else {
-                return "You are about the exit this notebook and leave the kernel running.";
-            };
-        });
     };