diff --git a/static/plugin_dbui/src/linkedcombobox.js b/static/plugin_dbui/src/linkedcombobox.js
index 95b1fbecaf2c7303618c53bcdb2bf9723f6d601c..61933663b2b496276259d7e8a9f81f969013f3d8 100644
--- a/static/plugin_dbui/src/linkedcombobox.js
+++ b/static/plugin_dbui/src/linkedcombobox.js
@@ -52,15 +52,11 @@ App.form.LinkedComboBox = Ext.extend(Ext.form.ComboBox, {
                 fields: [this.displayField, this.valueField]
             });
 
-            if (!this.masterStore.getTotalCount()) {
-                this.masterStore.load({
-                    callback: this.loadMasterData, 
-                    scope: this
-                });
-                
-            } else {
-                this.loadMasterData();
-            }  
+            this.masterStore.restoreWhere()
+            this.masterStore.load({
+                callback: this.loadMasterData, 
+                scope: this
+            });                
         }
         
         // prepare the store for the slave role
@@ -118,9 +114,14 @@ App.form.LinkedComboBox = Ext.extend(Ext.form.ComboBox, {
         // To fix this issue, the code mimic the click by a user
         // on the slave combobox and then it works !!!
         //
+        // In some case a window on the top left appears with
+        // the content of the combobox. 
+        // The line combo.hasFocus is a protection against this case.
+        //
         
         function initialise(combo) {
             combo.onTriggerClick();
+            combo.hasFocus = false;
             combo.collapse();
             combo.reset();
             combo.disable();