diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py
index 57bd6072..bc3be98e 100644
--- a/platformcode/keymaptools.py
+++ b/platformcode/keymaptools.py
@@ -123,8 +123,12 @@ class Main(xbmcgui.WindowXMLDialog):
         if action.getId() == xbmcgui.ACTION_CONTEXT_MENU:
             config.open_settings()
 
+        focus = self.getFocusId()
+
         if action == 3:
-            if submenu:
+            if focus == 61:
+                self.setFocusId(32500)
+            elif submenu:
                 self.close()
                 open_shortcut_menu()
             elif self.getControl(32500).getSelectedItem().getProperty('channel') in ['news', 'channelselector', 'search', 'videolibrary']:
diff --git a/resources/skins/Default/720p/DarkShortCutMenu.xml b/resources/skins/Default/720p/DarkShortCutMenu.xml
index 4edad7cf..9ba71b24 100644
--- a/resources/skins/Default/720p/DarkShortCutMenu.xml
+++ b/resources/skins/Default/720p/DarkShortCutMenu.xml
@@ -164,7 +164,7 @@
 					<showonepage>false</showonepage>
 					<orientation>horizontal</orientation>
 					<ondown>32500</ondown>
-					<onup>32500</onup>
+					<!-- <onup>32500</onup> -->
 					<animation effect="slide" end="120,0" time="0" condition="!Control.IsVisible(5)">Conditional</animation>
 				</control>
 			</control>
diff --git a/resources/skins/Default/720p/ShortCutMenu.xml b/resources/skins/Default/720p/ShortCutMenu.xml
index c44b25a2..d36e2ab4 100644
--- a/resources/skins/Default/720p/ShortCutMenu.xml
+++ b/resources/skins/Default/720p/ShortCutMenu.xml
@@ -164,7 +164,7 @@
 					<showonepage>false</showonepage>
 					<orientation>horizontal</orientation>
 					<ondown>32500</ondown>
-					<onup>32500</onup>
+					<!-- <onup>32500</onup> -->
 					<animation effect="slide" end="120,0" time="0" condition="!Control.IsVisible(5)">Conditional</animation>
 				</control>
 			</control>