diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index ceefa695..6cd509f0 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -455,8 +455,9 @@ requires
                 metaKey: "meta", // mac: command
                 shiftKey: "shift"
             };
-            
+
         $(function() {
+            // fixme: how to do this better?
             if ($.browser.safari) {
                 $document.keydown(keydown);                
             } else {
@@ -2044,6 +2045,10 @@ requires
             if (self.options.selected > -1) {
                 that.items[self.options.selected].trigger("mouseleave");
             }
+            if (self.options.parent) {
+                console.log(self.options.element)
+                self.options.element.removeClass("OxSelected");
+            }
             that.loseFocus();
             that.unbindEvent({
                 key_up: selectPreviousItem,
@@ -2221,7 +2226,7 @@ requires
         }
 
         function mouseleave() {
-            if (!self.options.disabled && !self.options.submenu) {
+            if (!self.options.disabled && !self.options.items.length) {
                 that.removeClass("OxSelected");
                 self.options.menu.options({
                     selected: -1