diff --git a/CHANGES.md b/CHANGES.md
index 43f0b9d6..7c276ce5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,12 @@
 
 ### Breaking Changes
 
+  * `XMonad.Prompt`
+
+    Now `mkComplFunFromList` and `mkComplFunFromList'` take an
+    additional `XPConfig` argument, so that they can take into
+    account the given `searchPredicate`.
+
   * `XMonad.Hooks.EwmhDesktops`
 
     It is no longer recommended to use `fullscreenEventHook` directly.
diff --git a/XMonad/Actions/DynamicProjects.hs b/XMonad/Actions/DynamicProjects.hs
index 4f33ff70..1f86564a 100644
--- a/XMonad/Actions/DynamicProjects.hs
+++ b/XMonad/Actions/DynamicProjects.hs
@@ -145,24 +145,24 @@ instance ExtensionClass ProjectState where
 
 --------------------------------------------------------------------------------
 -- Internal types for working with XPrompt.
-data ProjectPrompt = ProjectPrompt ProjectMode [ProjectName]
+data ProjectPrompt = ProjectPrompt XPConfig ProjectMode [ProjectName]
 data ProjectMode = SwitchMode | ShiftMode | RenameMode | DirMode
 
 instance XPrompt ProjectPrompt where
-  showXPrompt (ProjectPrompt submode _) =
+  showXPrompt (ProjectPrompt _ submode _) =
     case submode of
       SwitchMode -> "Switch or Create Project: "
       ShiftMode  -> "Send Window to Project: "
       RenameMode -> "New Project Name: "
       DirMode    -> "Change Project Directory: "
 
-  completionFunction (ProjectPrompt RenameMode _) = return . (:[])
-  completionFunction (ProjectPrompt DirMode _) =
+  completionFunction (ProjectPrompt _ RenameMode _) = return . (:[])
+  completionFunction (ProjectPrompt _ DirMode _) =
     let xpt = directoryMultipleModes "" (const $ return ())
     in completionFunction xpt
-  completionFunction (ProjectPrompt _ ns) = mkComplFunFromList' ns
+  completionFunction (ProjectPrompt c _ ns) = mkComplFunFromList' c ns
 
-  modeAction (ProjectPrompt SwitchMode _) buf auto = do
+  modeAction (ProjectPrompt _ SwitchMode _) buf auto = do
     let name = if null auto then buf else auto
     ps <- XS.gets projects
 
@@ -171,17 +171,17 @@ instance XPrompt ProjectPrompt where
       Nothing | null name -> return ()
               | otherwise -> switchProject (defProject name)
 
-  modeAction (ProjectPrompt ShiftMode _) buf auto = do
+  modeAction (ProjectPrompt _ ShiftMode _) buf auto = do
     let name = if null auto then buf else auto
     ps <- XS.gets projects
     shiftToProject . fromMaybe (defProject name) $ Map.lookup name ps
 
-  modeAction (ProjectPrompt RenameMode _) name _ =
+  modeAction (ProjectPrompt _ RenameMode _) name _ =
     when (not (null name) && not (all isSpace name)) $ do
       renameWorkspaceByName name
       modifyProject (\p -> p { projectName = name })
 
-  modeAction (ProjectPrompt DirMode _) buf auto = do
+  modeAction (ProjectPrompt _ DirMode _) buf auto = do
     let dir' = if null auto then buf else auto
     dir <- io $ makeAbsolute dir'
     modifyProject (\p -> p { projectDirectory = dir })
@@ -331,7 +331,7 @@ projectPrompt submodes c = do
   ps <- XS.gets projects
 
   let names = sort (Map.keys ps `union` ws)
-      modes = map (\m -> XPT $ ProjectPrompt m names) submodes
+      modes = map (\m -> XPT $ ProjectPrompt c m names) submodes
 
   mkXPromptWithModes modes c
 
diff --git a/XMonad/Actions/DynamicWorkspaceGroups.hs b/XMonad/Actions/DynamicWorkspaceGroups.hs
index 9f12ad96..dc0dc651 100644
--- a/XMonad/Actions/DynamicWorkspaceGroups.hs
+++ b/XMonad/Actions/DynamicWorkspaceGroups.hs
@@ -133,7 +133,7 @@ instance XPrompt WSGPrompt where
 promptWSGroupView :: XPConfig -> String -> X ()
 promptWSGroupView xp s = do
   gs <- fmap (M.keys . unWSG) XS.get
-  mkXPrompt (WSGPrompt s) xp (mkComplFunFromList' gs) viewWSGroup
+  mkXPrompt (WSGPrompt s) xp (mkComplFunFromList' xp gs) viewWSGroup
 
 -- | Prompt for a name for the current workspace group.
 promptWSGroupAdd :: XPConfig -> String -> X ()
@@ -144,4 +144,4 @@ promptWSGroupAdd xp s =
 promptWSGroupForget :: XPConfig -> String -> X ()
 promptWSGroupForget xp s = do
   gs <- fmap (M.keys . unWSG) XS.get
-  mkXPrompt (WSGPrompt s) xp (mkComplFunFromList' gs) forgetWSGroup
+  mkXPrompt (WSGPrompt s) xp (mkComplFunFromList' xp gs) forgetWSGroup
diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs
index 13a6b5c7..808f7793 100644
--- a/XMonad/Actions/TagWindows.hs
+++ b/XMonad/Actions/TagWindows.hs
@@ -180,7 +180,7 @@ instance XPrompt TagPrompt where
 tagPrompt :: XPConfig -> (String -> X ()) -> X ()
 tagPrompt c f = do
   sc <- tagComplList
-  mkXPrompt TagPrompt c (mkComplFunFromList' sc) f
+  mkXPrompt TagPrompt c (mkComplFunFromList' c sc) f
 
 tagComplList :: X [String]
 tagComplList = gets (concat . map (integrate' . stack) . workspaces . windowset) >>=
@@ -192,7 +192,7 @@ tagDelPrompt :: XPConfig -> X ()
 tagDelPrompt c = do
   sc <- tagDelComplList
   if (sc /= [])
-    then mkXPrompt TagPrompt c (mkComplFunFromList' sc) (\s -> withFocused (delTag s))
+    then mkXPrompt TagPrompt c (mkComplFunFromList' c sc) (\s -> withFocused (delTag s))
     else return ()
 
 tagDelComplList :: X [String]
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs
index dc994d83..9dd5a7af 100644
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -1605,19 +1605,18 @@ mkUnmanagedWindow d s rw x y w h = do
 
 -- | This function takes a list of possible completions and returns a
 -- completions function to be used with 'mkXPrompt'
-mkComplFunFromList :: [String] -> String -> IO [String]
-mkComplFunFromList _ [] = return []
-mkComplFunFromList l s =
-  return $ filter (\x -> take (length s) x == s) l
+mkComplFunFromList :: XPConfig -> [String] -> String -> IO [String]
+mkComplFunFromList _ _ [] = return []
+mkComplFunFromList c l s =
+  pure $ filter (searchPredicate c s) l
 
 -- | This function takes a list of possible completions and returns a
 -- completions function to be used with 'mkXPrompt'. If the string is
 -- null it will return all completions.
-mkComplFunFromList' :: [String] -> String -> IO [String]
-mkComplFunFromList' l [] = return l
-mkComplFunFromList' l s =
-  return $ filter (\x -> take (length s) x == s) l
-
+mkComplFunFromList' :: XPConfig -> [String] -> String -> IO [String]
+mkComplFunFromList' _ l [] = return l
+mkComplFunFromList' c l s =
+  pure $ filter (searchPredicate c s) l
 
 -- | Given the prompt type, the command line and the completion list,
 -- return the next completion in the list for the last word of the
diff --git a/XMonad/Prompt/ConfirmPrompt.hs b/XMonad/Prompt/ConfirmPrompt.hs
index 650b62ab..1fc258d1 100644
--- a/XMonad/Prompt/ConfirmPrompt.hs
+++ b/XMonad/Prompt/ConfirmPrompt.hs
@@ -48,4 +48,4 @@ instance XPrompt EnterPrompt where
      and simply ask to confirm (ENTER) or cancel (ESCAPE). The actual key
      handling is done by mkXPrompt.-}
 confirmPrompt :: XPConfig -> String -> X() -> X()
-confirmPrompt config app func = mkXPrompt (EnterPrompt app) config (mkComplFunFromList []) $ const func
+confirmPrompt config app func = mkXPrompt (EnterPrompt app) config (mkComplFunFromList config []) $ const func
diff --git a/XMonad/Prompt/Email.hs b/XMonad/Prompt/Email.hs
index 7a746df9..634cdcb0 100644
--- a/XMonad/Prompt/Email.hs
+++ b/XMonad/Prompt/Email.hs
@@ -56,7 +56,7 @@ import XMonad.Prompt.Input
 --   of addresses for autocompletion.
 emailPrompt :: XPConfig -> [String] -> X ()
 emailPrompt c addrs =
-    inputPromptWithCompl c "To" (mkComplFunFromList addrs) ?+ \to ->
+    inputPromptWithCompl c "To" (mkComplFunFromList c addrs) ?+ \to ->
     inputPrompt c "Subject" ?+ \subj ->
     inputPrompt c "Body" ?+ \body ->
     runProcessWithInput "mail" ["-s", subj, to] (body ++ "\n")
diff --git a/XMonad/Prompt/Layout.hs b/XMonad/Prompt/Layout.hs
index 76aa9381..51efad24 100644
--- a/XMonad/Prompt/Layout.hs
+++ b/XMonad/Prompt/Layout.hs
@@ -46,4 +46,4 @@ import XMonad.Layout.LayoutCombinators ( JumpToLayout(..) )
 
 layoutPrompt :: XPConfig -> X ()
 layoutPrompt c = do ls <- gets (map (description . layout) . workspaces . windowset)
-                    mkXPrompt (Wor "") c (mkComplFunFromList' $ sort $ nub ls) (sendMessage . JumpToLayout)
+                    mkXPrompt (Wor "") c (mkComplFunFromList' c $ sort $ nub ls) (sendMessage . JumpToLayout)
diff --git a/XMonad/Prompt/Man.hs b/XMonad/Prompt/Man.hs
index e0a7805f..3e6b245e 100644
--- a/XMonad/Prompt/Man.hs
+++ b/XMonad/Prompt/Man.hs
@@ -60,7 +60,7 @@ instance XPrompt Man where
 manPrompt :: XPConfig -> X ()
 manPrompt c = do
   mans <- io getMans
-  mkXPrompt Man c (manCompl mans) $ runInTerm "" . (++) "man "
+  mkXPrompt Man c (manCompl c mans) $ runInTerm "" . (++) "man "
 
 getMans :: IO [String]
 getMans = do
@@ -80,12 +80,12 @@ getMans = do
               else return []
   return $ uniqSort $ concat mans
 
-manCompl :: [String] -> String -> IO [String]
-manCompl mans s | s == "" || last s == ' ' = return []
-                | otherwise                = do
+manCompl :: XPConfig -> [String] -> String -> IO [String]
+manCompl c mans s | s == "" || last s == ' ' = return []
+                  | otherwise                = do
   -- XXX readline instead of bash's compgen?
   f <- lines <$> getCommandOutput ("bash -c 'compgen -A file " ++ s ++ "'")
-  mkComplFunFromList (f ++ mans) s
+  mkComplFunFromList c (f ++ mans) s
 
 -- | Run a command using shell and return its output.
 --
diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs
index 19be1d0c..801d97c2 100644
--- a/XMonad/Prompt/Ssh.hs
+++ b/XMonad/Prompt/Ssh.hs
@@ -57,14 +57,14 @@ instance XPrompt Ssh where
     showXPrompt       Ssh = "SSH to: "
     commandToComplete _ c = maybe c (\(_u,h) -> h) (parseHost c)
     nextCompletion _t c l = maybe next (\(u,_h) -> u ++ "@" ++ next) hostPared
-                            where 
+                            where
                               hostPared = parseHost c
                               next = getNextCompletion (maybe c (\(_u,h) -> h) hostPared) l
 
 sshPrompt :: XPConfig -> X ()
 sshPrompt c = do
   sc <- io sshComplList
-  mkXPrompt Ssh c (mkComplFunFromList sc) ssh
+  mkXPrompt Ssh c (mkComplFunFromList c sc) ssh
 
 ssh :: String -> X ()
 ssh = runInTerm "" . ("ssh " ++ )
diff --git a/XMonad/Prompt/Theme.hs b/XMonad/Prompt/Theme.hs
index 1349bd1e..14aa217d 100644
--- a/XMonad/Prompt/Theme.hs
+++ b/XMonad/Prompt/Theme.hs
@@ -48,7 +48,7 @@ instance XPrompt ThemePrompt where
     nextCompletion      _ = getNextCompletion
 
 themePrompt :: XPConfig -> X ()
-themePrompt c = mkXPrompt ThemePrompt c (mkComplFunFromList' . map ppThemeInfo $ listOfThemes) changeTheme
+themePrompt c = mkXPrompt ThemePrompt c (mkComplFunFromList' c . map ppThemeInfo $ listOfThemes) changeTheme
     where changeTheme t = sendMessage . SetTheme . fromMaybe def $ M.lookup t mapOfThemes
 
 mapOfThemes :: M.Map String Theme
diff --git a/XMonad/Prompt/Workspace.hs b/XMonad/Prompt/Workspace.hs
index b3247627..b0f91660 100644
--- a/XMonad/Prompt/Workspace.hs
+++ b/XMonad/Prompt/Workspace.hs
@@ -46,4 +46,4 @@ workspacePrompt :: XPConfig -> (String -> X ()) -> X ()
 workspacePrompt c job = do ws <- gets (workspaces . windowset)
                            sort <- getSortByIndex
                            let ts = map tag $ sort ws
-                           mkXPrompt (Wor "") c (mkComplFunFromList' ts) job
+                           mkXPrompt (Wor "") c (mkComplFunFromList' c ts) job
diff --git a/XMonad/Prompt/XMonad.hs b/XMonad/Prompt/XMonad.hs
index ce075be6..fce2ef1b 100644
--- a/XMonad/Prompt/XMonad.hs
+++ b/XMonad/Prompt/XMonad.hs
@@ -51,5 +51,5 @@ xmonadPrompt c = do
 -- | An xmonad prompt with a custom command list
 xmonadPromptC :: [(String, X ())] -> XPConfig -> X ()
 xmonadPromptC commands c =
-    mkXPrompt XMonad c (mkComplFunFromList' (map fst commands)) $
+    mkXPrompt XMonad c (mkComplFunFromList' c (map fst commands)) $
         fromMaybe (return ()) . (`lookup` commands)