diff --git a/scripts/gui/advfort.lua b/scripts/gui/advfort.lua
index 11c335637..5dc3643b7 100644
--- a/scripts/gui/advfort.lua
+++ b/scripts/gui/advfort.lua
@@ -934,10 +934,16 @@ end
 function usetool:openShopWindowButtoned(building,no_reset)
     local wui=df.global.ui_sidebar_menus.workshop_job
     if not no_reset then
+        --[[ manual reset incase the df-one does not exist?
         wui:assign{category_id=-1,mat_type=-1,mat_index=-1}
         for k,v in pairs(wui.material_category) do
             wui.material_category[k]=false
         end
+        ]]--
+        building:fillSidebarMenu()
+        if #wui.choices_all>0 then
+            wui.choices_all[#wui.choices_all-1]:click()
+        end
     end
     building:fillSidebarMenu()