diff --git a/notebook/static/notebook/js/codecell.js b/notebook/static/notebook/js/codecell.js
index 5451f676c..7438f32b7 100644
--- a/notebook/static/notebook/js/codecell.js
+++ b/notebook/static/notebook/js/codecell.js
@@ -203,6 +203,12 @@ define([
         this.element.focusout(
             function() { that.auto_highlight(); }
         );
+
+        this.events.on('kernel_restarting.Kernel', function() {
+            if (that.input_prompt_number === '*') {
+              that.set_input_prompt();
+            }
+        });
     };