diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index b479c1d18..ea2470e4b 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -399,10 +399,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
 
         switch(game->main_interface.bottom_mode_selected) {
         case df::enums::main_bottom_mode_type::STOCKPILE:
+            newFocusString += "/Stockpile";
             if (game->main_interface.stockpile.cur_bld) {
                 newFocusString += "/Some";
             }
-            newFocusString += "/Stockpile";
             break;
         case df::enums::main_bottom_mode_type::STOCKPILE_PAINT:
             newFocusString += "/Stockpile/Paint";
diff --git a/plugins/lua/stockpiles.lua b/plugins/lua/stockpiles.lua
index 9740929ec..c7a8cc527 100644
--- a/plugins/lua/stockpiles.lua
+++ b/plugins/lua/stockpiles.lua
@@ -397,7 +397,7 @@ StockpilesOverlay.ATTRS{
     desc='Shows a panel when a stockpile is selected for stockpile automation.',
     default_pos={x=24, y=-6},
     default_enabled=true,
-    viewscreens='dwarfmode/Some/Stockpile',
+    viewscreens='dwarfmode/Stockpile/Some',
     frame={w=65, h=4},
 }