diff --git a/notebook/static/notebook/js/outputarea.js b/notebook/static/notebook/js/outputarea.js
index 99bdf97cc0..3cdf23316b 100644
--- a/notebook/static/notebook/js/outputarea.js
+++ b/notebook/static/notebook/js/outputarea.js
@@ -370,6 +370,7 @@ define([
     OutputArea.prototype.create_output_area = function () {
         var oa = $("<div/>").addClass("output_area");
         if (this.prompt_area) {
+            oa.append($('<div/>').addClass('run_this_cell'));
             oa.append($('<div/>').addClass('prompt'));
         }
         return oa;
diff --git a/notebook/static/notebook/less/codecell.less b/notebook/static/notebook/less/codecell.less
index 1f204ed502..db75f0db05 100644
--- a/notebook/static/notebook/less/codecell.less
+++ b/notebook/static/notebook/less/codecell.less
@@ -42,7 +42,7 @@ div.code_cell div.input_prompt {
     min-width: 11ex;
 }
 
-div.code_cell:hover .run_this_cell {
+div.code_cell:hover div.input .run_this_cell {
     visibility: visible;
 }
 
@@ -70,4 +70,3 @@ div.input_area > div.highlight > pre {
     padding: 0px;
     background-color: transparent;
 }
-
diff --git a/notebook/static/notebook/less/outputarea.less b/notebook/static/notebook/less/outputarea.less
index 573032c216..7e4d39346c 100644
--- a/notebook/static/notebook/less/outputarea.less
+++ b/notebook/static/notebook/less/outputarea.less
@@ -41,6 +41,7 @@ div.out_prompt_overlay:hover {
 
 div.output_prompt {
     color: @output_prompt_color;
+    min-width: 11ex;
 }
 
 /* This class is the outer container of all output sections. */