diff --git a/micromamba.el b/micromamba.el
index f1ddb24..6194c62 100644
--- a/micromamba.el
+++ b/micromamba.el
@@ -385,8 +385,8 @@ buffer."
   :global t
   ;; Forms
   (if micromamba-env-autoactivate-mode ;; already on, now switching off
-      (advice-add 'switch-to-buffer :after #'micromamba--switch-buffer-auto-activate)
-    (advice-remove 'switch-to-buffer #'micromamba--switch-buffer-auto-activate)))
+    (add-to-list 'window-selection-change-functions #'micromamba--switch-buffer-auto-activate)
+    (delete #'micromamba--switch-buffer-auto-activate 'window-selection-change-functions)))
 
 (provide 'micromamba)
 ;;; micromamba.el ends here