diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index c518af49e..e0ac198f6 100644
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@@ -68,7 +68,6 @@ function (marked) {
     IPython.tooltip = new IPython.Tooltip()
     IPython.notification_area = new IPython.NotificationArea('#notification_area')
     IPython.notification_area.init_notification_widgets();
-    IPython.comm_manager = new IPython.CommManager();
 
     IPython.layout_manager.do_resize();
 
@@ -95,7 +94,6 @@ function (marked) {
         }
         IPython.notebook.set_autosave_interval(IPython.notebook.minimum_autosave_interval);
         // only do this once
-        IPython.comm_manager.init_kernel(IPython.notebook.kernel);
         $([IPython.events]).off('notebook_loaded.Notebook', first_load);
     };
     
diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js
index 210aad730..0dcdf7bd8 100644
--- a/IPython/html/static/services/kernels/js/kernel.js
+++ b/IPython/html/static/services/kernels/js/kernel.js
@@ -46,6 +46,7 @@ var IPython = (function (IPython) {
         
         this.bind_events();
         this.init_iopub_handlers();
+        this.comm_manager = new IPython.CommManager(this);
     };