diff --git a/Library/Homebrew/extend/os/mac/search.rb b/Library/Homebrew/extend/os/mac/search.rb
index bd188a2425..a2f2af139b 100644
--- a/Library/Homebrew/extend/os/mac/search.rb
+++ b/Library/Homebrew/extend/os/mac/search.rb
@@ -31,9 +31,16 @@ module Homebrew
           end
         end
 
-        results = Cask::Cask.search(string_or_regex, &:token).sort_by(&:token)
+        cask_tokens = Tap.flat_map(&:cask_tokens)
 
-        results.map do |cask|
+        results = cask_tokens.extend(Searchable)
+                             .search(string_or_regex)
+
+        results |= DidYouMean::SpellChecker.new(dictionary: cask_tokens)
+                                           .correct(string_or_regex)
+
+        results.sort.map do |name|
+          cask = Cask::CaskLoader.load(name)
           if cask.installed?
             pretty_installed(cask.token)
           else