diff --git a/workflow/engine/js/controls/variablePicker.js b/workflow/engine/js/controls/variablePicker.js
index c3b39db45..8dac84bd3 100755
--- a/workflow/engine/js/controls/variablePicker.js
+++ b/workflow/engine/js/controls/variablePicker.js
@@ -4,6 +4,7 @@ var setVariablePickerJS = function(){
         if(this.value.substring(0,5) == 'gridt') {
             try {
                 updateEditorContent(this.value.substring(5));
+                closePluginPopup();
             } catch(err) {
                 closePluginPopup();
             }
@@ -21,6 +22,7 @@ var setVariablePickerJS = function(){
           if(element.value.substring(0,5) == 'gridt') { 
             try {
                 updateEditorContent(element.value.substring(5));
+                closePluginPopup();
             } catch(err) {
                 closePluginPopup();
             }