diff --git a/userland/terminal.el b/userland/terminal.el
index 37d950e..596e4ef 100644
--- a/userland/terminal.el
+++ b/userland/terminal.el
@@ -30,7 +30,7 @@
   :group 'theurgy
   :group 'theurgy-compat)
 
-(when (or (not (equal system-type 'windows-nt)) theurgy-enable-vterm-windows)
+(when (or (equal system-type 'gnu/linux) theurgy-enable-vterm-windows)
   (use-package vterm
     :ensure t))
 
@@ -76,7 +76,8 @@
 (define-key global-map (kbd "C-<return>") 'theurgy-main-shell)
 
 (global-set-key (kbd "M-RET") 'theurgy-bottom-shell)
-(define-key vterm-mode-map (kbd "M-RET") 'theurgy-bottom-shell)
+(when (fboundp 'vterm)
+  (define-key vterm-mode-map (kbd "M-RET") 'theurgy-bottom-shell))
 
 (add-to-list 'display-buffer-alist
              '("\\*vterm\\*\\|\\*shell\\*"