diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index 093b8525b..3313566ec 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -115,6 +115,10 @@ span.section_row_buttons a {
     float: right;
 }
 
+#timebeforetooltip_span {
+    float: right;
+}
+
 #tooltipontab_span {
     float: right;
 }
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 08712a7c7..0655e5b10 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -269,7 +269,7 @@
                     <span class="checkbox_label" id="smartcompleter_label">Smart completer:</span>
                 </div>
                 <div class="section_row">
-                    <span id="tooltipontab_span">
+                    <span id="timebeforetooltip_span">
                         <input type="text" id="timebeforetooltip" value="1200"></input>
                     </span>
                     <span class="numeric_input_label" id="timebeforetooltip_label">Time before tooltip : </span>