diff --git a/web/org.openbravo.userinterface.smartclient/isomorphic/client/widgets/form/ComboBoxItem.js b/web/org.openbravo.userinterface.smartclient/isomorphic/client/widgets/form/ComboBoxItem.js
--- a/web/org.openbravo.userinterface.smartclient/isomorphic/client/widgets/form/ComboBoxItem.js
+++ b/web/org.openbravo.userinterface.smartclient/isomorphic/client/widgets/form/ComboBoxItem.js
@@ -253,10 +253,14 @@
         if (this.pickList && this.pickList.isVisible() && 
             this.pickList.contains(isc.EH.getTarget())) 
         {            
-            this.focusInItem();
+            this.focusOnPickValue();
         }
     },
-    
+   
+    focusOnPickValue: function() {
+        this.focusInItem();
+    },
+ 
     // Implement pickListHidden to clear the page level click event to hide the pickList, if
     // we haven't already.
     pickListHidden : function () {
@@ -1252,6 +1256,8 @@
         
         this.updateValue();
         delete this._valuePicked;
+        
+	this.focusOnPickValue();
     },
     
     // override setValue map to update the list and update the displayed value if necessary.