diff --git a/lisp/init-occur.el b/lisp/init-occur.el
index f883f42..103bcd1 100644
--- a/lisp/init-occur.el
+++ b/lisp/init-occur.el
@@ -14,6 +14,9 @@
         regexp-history)
   (call-interactively 'occur))
 
+(use-package loccur
+  :bind
+  (("C-o" . loccur-current)))
 
 (provide 'init-occur)
 ;;; init-occur.el ends here
diff --git a/lisp/init-windowmgmt.el b/lisp/init-windowmgmt.el
index a3b0fb7..42cb8d4 100644
--- a/lisp/init-windowmgmt.el
+++ b/lisp/init-windowmgmt.el
@@ -105,7 +105,8 @@ to next buffer otherwise."
 
   ;; M-o doesn't  work when using emacs  via Win->RDP->VNC->X11->Xmonad,
   ;; so fall back to C-o.
-  (global-set-key (kbd "C-o")             'other-window-or-switch-buffer)
+  ;; I'm not using windows anymore
+  ;; (global-set-key (kbd "C-o")             'other-window-or-switch-buffer)
 
   ;; Use only in  X11 emacs - setting M-O inside console  causes <up> and
   ;; <down> to stop working properly, for whatever reasons.