diff --git a/apparmor.d/abstractions/app/editor b/apparmor.d/abstractions/app/editor
index b4cb1e7d8..9b9933b1a 100644
--- a/apparmor.d/abstractions/app/editor
+++ b/apparmor.d/abstractions/app/editor
@@ -5,8 +5,7 @@
   include <abstractions/nameservice-strict>
 
   @{bin}/sensible-editor        mr,
-  @{bin}/vim                  mrix,
-  @{bin}/vim.*                mrix,
+  @{bin}/vim{,.*}             mrix,
   @{sh_path}                   rix,
   @{bin}/which{,.debianutils}  rix,
 
@@ -17,12 +16,13 @@
   /etc/vim/{,**} r,
 
   owner @{HOME}/.selected_editor r,
-  owner @{HOME}/.viminfo{,.tmp} rw,
+  owner @{HOME}/.viminf@{c}{,.tmp} rw,
   owner @{HOME}/.vimrc r,
 
   # Vim swap file 
   owner @{HOME}/ r,
   owner @{user_cache_dirs}/ r,
-  owner @{user_cache_dirs}/vim/** wr,
+  owner @{user_cache_dirs}/vim/{,**} rw,
+  owner @{user_config_dirs}/vim/{,**} r,
 
   include if exists <abstractions/app/editor.d>