diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index bfc731cf3..724d07548 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -158,6 +158,9 @@ current buffer."
   :init-value nil
   :keymap +popup-buffer-mode-map)
 
+(put '+popup-buffer-mode 'permanent-local t)
+(put '+popup-buffer-mode 'permanent-local-hook t)
+
 
 ;;
 ;; Hooks