diff --git a/init.el b/init.el
index 6f7c911..676c07c 100644
--- a/init.el
+++ b/init.el
@@ -560,10 +560,15 @@ With argument, do this that many times."
   :custom
   (ivy-use-virtual-buffers t)
   (ivy-count-format "[%d/%d] ")
+  (ivy-wrap t)
   :config
   (ivy-mode 1)
   :bind
   ("C-c C-r" . 'ivy-resume)
+  (:map ivy-minibuffer-map
+        ("M-<up>" . ivy-previous-history-element)
+        ("M-<down>" . ivy-next-history-element)
+        )
   )
 
 ;; Extensions for ivy