diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index f69e11778..2c4322286 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -391,6 +391,17 @@ DEFINE_GET_FOCUS_STRING_HANDLER(layer_assigntrade)
         focus += "/Items";
 }
 
+DEFINE_GET_FOCUS_STRING_HANDLER(stores)
+{
+    if (!screen->in_right_list)
+        focus += "/Categories";
+    else if (screen->in_group_mode)
+        focus += "/Groups";
+    else
+        focus += "/Items";
+}
+
+
 std::string Gui::getFocusString(df::viewscreen *top)
 {
     if (!top)