diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index 0a34701..093b852 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -119,6 +119,10 @@ span.section_row_buttons a {
     float: right;
 }
 
+#smartcompleter_span {
+    float: right;
+}
+
 .checkbox_label {
     font-size: 85%;
     float: right;
diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 2fed320..7605bde 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -179,6 +179,19 @@ var IPython = (function (IPython) {
 
     CodeCell.prototype.finish_completing = function (matched_text, matches) {
         // console.log("Got matches", matched_text, matches);
+        var newm = new Array();
+        if(this.notebook.smart_completer)
+        {
+            kwargs = new Array();
+            other = new Array();
+            for(var i=0;i<matches.length; ++i){
+                if(matches[i].substr(-1) === '='){
+                    kwargs.push(matches[i]);
+                }else{other.push(matches[i]);}
+            }
+            newm = kwargs.concat(other);
+            matches=newm;
+        }
         if (!this.is_completing || matches.length === 0) {return;}
 
         var that = this;
diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index c0c2d22..7702a22 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -28,6 +28,7 @@ var IPython = (function (IPython) {
         this.create_elements();
         this.bind_events();
         this.set_tooltipontab(true);
+        this.set_smartcompleter(true);
         this.set_timebeforetooltip(1200);
     };
 
@@ -633,6 +634,11 @@ var IPython = (function (IPython) {
         this.tooltip_on_tab = state;
     };
 
+    Notebook.prototype.set_smartcompleter = function (state) {
+        console.log("Smart completion (kwargs first) changed to  to : "+state);
+        this.smart_completer = state;
+    };
+
     Notebook.prototype.set_autoindent = function (state) {
         var cells = this.cells();
         len = cells.length;
diff --git a/IPython/frontend/html/notebook/static/js/panelsection.js b/IPython/frontend/html/notebook/static/js/panelsection.js
index 45b3835..1e3bcc7 100644
--- a/IPython/frontend/html/notebook/static/js/panelsection.js
+++ b/IPython/frontend/html/notebook/static/js/panelsection.js
@@ -140,6 +140,8 @@ var IPython = (function (IPython) {
         this.content.find('#timebeforetooltip').attr('title', 'Time before a tooltip auto-appear when "(" is pressed (negative value supress tooltip)');
         this.content.find('#timebeforetooltip_label').attr('title', 'Time before a tooltip auto-appear when "(" is pressed (negative value supress tooltip)');
 
+        this.content.find('#smartcompleter').attr('title', 'When inside function call, completer try to propose kwargs first');
+        this.content.find('#smartcompleter_label').attr('title', 'When inside function call, completer try to propose kwargs first');
     };
 
 
@@ -153,6 +155,10 @@ var IPython = (function (IPython) {
             var state = $('#timebeforetooltip').prop('value');
             IPython.notebook.set_timebeforetooltip(state);
         });
+        this.content.find('#smartcompleter').change(function () {
+            var state = $('#smartcompleter').prop('checked');
+            IPython.notebook.set_smartcompleter(state);
+        });
     };
 
     // CellSection
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index c99e07c..08712a7 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -263,6 +263,12 @@
                     <span class="checkbox_label" id="tooltipontab_label">Tooltip on tab:</span>
                 </div>
                 <div class="section_row">
+                    <span id="smartcompleter_span">
+                        <input type="checkbox" id="smartcompleter" checked="true"></input>
+                    </span>
+                    <span class="checkbox_label" id="smartcompleter_label">Smart completer:</span>
+                </div>
+                <div class="section_row">
                     <span id="tooltipontab_span">
                         <input type="text" id="timebeforetooltip" value="1200"></input>
                     </span>