diff --git a/IPython/html/static/notebook/js/config.js b/IPython/html/static/notebook/js/config.js
index fc5bc7c..f300493 100644
--- a/IPython/html/static/notebook/js/config.js
+++ b/IPython/html/static/notebook/js/config.js
@@ -67,7 +67,6 @@ var IPython = (function (IPython) {
'diff' :{'reg':[/^diff/]}
},
- tooltip_on_tab : true,
};
// use the same method to merge user configuration
diff --git a/docs/source/whatsnew/pr/tooltip-on-tab.rst b/docs/source/whatsnew/pr/tooltip-on-tab.rst
new file mode 100644
index 0000000..60368c0
--- /dev/null
+++ b/docs/source/whatsnew/pr/tooltip-on-tab.rst
@@ -0,0 +1,4 @@
+ * In notebook, Showing tooltip on tab has been deactivated by default to avoid
+ conflict with completion, and will be completly removed in future version.
+ Shift-Tab could still be used to invoke tooltip when inside function
+ signature and/or on selection.