diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 0298b05e..e55bd79b 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1161,8 +1161,8 @@ it on by default. Its probably safe to turn it on when in a programming mode.
   :config
   (progn
     (defun imalison:maybe-use-frames-for-org (&rest args)
-      (let ((fn (if frame-mode 'org-switch-to-buffer-other-window
-                  'switch-to-buffer-other-frame)))
+      (let ((fn (if frame-mode 'switch-to-buffer-other-frame
+                  'switch-to-buffer-other-window)))
         (apply fn args)))
     (advice-add 'org-switch-to-buffer-other-window
                 :override 'imalison:maybe-use-frames-for-org)
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 12a1ae3f..6a35c37c 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -192,7 +192,6 @@ transmissionSelector = fmap (isPrefixOf "Transmission") title
 hangoutsSelector = chromeSelectorBase <&&> fmap isHangoutsTitle title
 gmailSelector = chromeSelectorBase <&&> fmap isGmailTitle title
 volumeSelector = className =? "Pavucontrol"
-keepassSelector = className =? "keepassxc"
 
 virtualClasses =
   [ (hangoutsSelector, "Hangouts")
@@ -208,10 +207,9 @@ gmailCommand = "start_chrome.sh --new-window https://mail.google.com/mail/u/0/#i
 spotifyCommand = "spotify"
 chromeCommand = "start_chrome.sh"
 emacsCommand = "emacsclient -c"
-htopCommand = "termite -e htop"
+htopCommand = "termite -e htop -t htop"
 transmissionCommand = "transmission-gtk"
 volumeCommand = "pavucontrol"
-keepassCommand = "systemctl --user restart keepassx.service"
 taffybarCommand = "restart_taffybar.sh"
 
 -- Startup hook