diff --git a/config.org b/config.org
index 34b1046..3e3d058 100644
--- a/config.org
+++ b/config.org
@@ -3737,7 +3737,10 @@ With those variables created, we can define our templates.
   (setq org-roam-capture-default-template
         '("d" "Default" plain ""
           :target (file+head "${file-maybe-dir}"
-                             "#+title: ${title}")
+                             "#+title: ${title}
+%(and-let* ((tags (org-fast-tag-selection nil nil org-current-tag-alist))
+            ((not (string-empty-p tags))))
+    (concat \"#+filetags: :\" tags \":\"))")
           :unnarrowed t
           :immediate-finish t)
         org-roam-dailies-capture-default-template
@@ -3750,7 +3753,10 @@ With those variables created, we can define our templates.
   (setq org-roam-capture-templates
         '(("f" "Standalone file" plain ""
            :target (file+head "${file-maybe-dir}"
-                              "#+title: ${title}")
+                              "#+title: ${title}
+%(and-let* ((tags (org-fast-tag-selection nil nil org-current-tag-alist))
+            ((not (string-empty-p tags))))
+    (concat \"#+filetags: :\" tags \":\"))")
            :unnarrowed t)
           ("n" "Bibliography note" plain ""
            :target