diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el
index cdd8a54b3..286ba7f3c 100644
--- a/modules/completion/ivy/autoload/evil.el
+++ b/modules/completion/ivy/autoload/evil.el
@@ -26,8 +26,8 @@
          (project-root (doom-project-root))
          (query
           (or query
-              (and (evil-visual-state-p)
-                   beg end
+              (and beg end
+                   (> (abs (- end beg)) 1)
                    (rxt-quote-pcre (buffer-substring-no-properties beg end)))
               +ivy--file-last-search))
          (prompt
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index 24bb36d50..053def28d 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -40,9 +40,10 @@ session)."
   (after! magit     (setq magit-completing-read-function #'ivy-completing-read))
   (after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions))
 
-  (add-hook 'window-setup-hook #'ivy-mode)
+  (add-hook 'emacs-startup-hook #'ivy-mode)
 
   (map! :map ivy-mode-map
+        [remap apropos]                   #'counsel-apropos
         [remap describe-face]             #'counsel-describe-face
         [remap find-file]                 #'counsel-find-file
         [remap switch-to-buffer]          #'+ivy/switch-buffer