diff --git a/extra/ui/tools/workspace/workspace.factor b/extra/ui/tools/workspace/workspace.factor
index 45dfd32609..86cfdb02c7 100755
--- a/extra/ui/tools/workspace/workspace.factor
+++ b/extra/ui/tools/workspace/workspace.factor
@@ -60,10 +60,10 @@ M: gadget tool-scroller drop f ;
   request-focus ;
 
 : show-popup ( gadget workspace -- )
-    dup hide-popup
-    2dup set-workspace-popup
-    dupd f track-add
-    request-focus ;
+  dup hide-popup
+  over >>popup
+  over f track-add* drop
+  request-focus ;
 
 : show-titled-popup ( workspace gadget title -- )
     [ find-workspace hide-popup ] <closable-gadget>