diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs
index 09d0b184..301b318e 100644
--- a/XMonad/Config/Arossato.hs
+++ b/XMonad/Config/Arossato.hs
@@ -147,8 +147,8 @@ arossatoConfig = do
           , ((modMask x              , xK_F3    ), shellPrompt       def                 )
           , ((modMask x              , xK_F4    ), sshPrompt         def                 )
           , ((modMask x              , xK_F5    ), themePrompt       def                 )
-          , ((modMask x              , xK_F6    ), windowPromptGoto  def                 )
-          , ((modMask x              , xK_F7    ), windowPromptBring def                 )
+          , ((modMask x              , xK_F6    ), windowPrompt def Goto  allWindows     )
+          , ((modMask x              , xK_F7    ), windowPrompt def Bring allWindows     )
           , ((modMask x              , xK_comma ), prevWS                                )
           , ((modMask x              , xK_period), nextWS                                )
           , ((modMask x              , xK_Right ), windows W.focusDown                   )
diff --git a/XMonad/Util/Scratchpad.hs b/XMonad/Util/Scratchpad.hs
index 63d4f60a..605790a0 100644
--- a/XMonad/Util/Scratchpad.hs
+++ b/XMonad/Util/Scratchpad.hs
@@ -26,6 +26,7 @@ module XMonad.Util.Scratchpad (
 import XMonad
 import qualified XMonad.StackSet as W
 import XMonad.Util.NamedScratchpad
+import XMonad.Util.WorkspaceCompare (filterOutWs)
 
 
 -- $usage
@@ -111,10 +112,8 @@ scratchpadManageHook rect = namedScratchpadManageHook [NS "" "" scratchpadQuery
 -- | Transforms a workspace list containing the SP workspace into one that
 -- doesn't contain it. Intended for use with logHooks.
 scratchpadFilterOutWorkspace :: [WindowSpace] -> [WindowSpace]
-scratchpadFilterOutWorkspace = namedScratchpadFilterOutWorkspace
+scratchpadFilterOutWorkspace = filterOutWs [scratchpadWorkspaceTag]
 
 
 scratchpadDefaultRect :: W.RationalRect
 scratchpadDefaultRect = W.RationalRect 0.25 0.375 0.5 0.25
-
-