diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index <HASH>..<HASH> 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -414,6 +414,7 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) {
                     if (e.button == 1) {
                         buttonflag = 1;
                     }
+                    paramobject.lastindex = select.get('selectedIndex');
                 };
 
                 var changedown = function(e, paramobject) {
@@ -421,6 +422,7 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) {
                         if(e.keyCode == 13) {
                             form.submit();
                         }
+                        paramobject.lastindex = select.get('selectedIndex');
                     }
                 }
MDL-<I> javascript: prevent JS from being triggered on select box by clicking on already selected option