diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 1fcfe7c4d..7ff96bccd 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -27,6 +27,13 @@
         epa-pinentry-mode 'loopback))
 
 
+(if (not (featurep 'evil))
+    (delete-selection-mode +1)
+  (defun turn-off-delete-selection-mode () (delete-selection-mode -1))
+  (add-hook 'evil-insert-state-entry-hook #'delete-selection-mode)
+  (add-hook 'evil-insert-state-exit-hook #'turn-off-delete-selection-mode))
+
+
 (when (featurep! +smartparens)
   ;; You can disable :unless predicates with (sp-pair "'" nil :unless nil)
   ;; And disable :post-handlers with (sp-pair "{" nil :post-handlers nil)
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index b5b3097b7..33a6c8820 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -27,8 +27,6 @@ line with a linewise comment.")
         evil-respect-visual-line-mode t
         ;; more vim-like behavior
         evil-symbol-word-search t
-        ;; don't activate mark on shift-click
-        shift-select-mode nil
         ;; cursor appearance
         evil-default-cursor '+evil-default-cursor
         evil-normal-state-cursor 'box