diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index 475f96c..3d253e3 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -255,6 +255,12 @@ before packages are loaded. If you are unsure, you should try in setting them in
                   monokai
                   monochrome
                   ))
+
+  ;; Use auctex with .tikz files too
+  (setq auto-mode-alist
+        (append
+         '(("\\.tikz\\'" . latex-mode))
+         auto-mode-alist))
   )
 
 (defun dotspacemacs/user-config ()
@@ -281,6 +287,7 @@ you should place you code here."
   ;; Tex viewers
   (setq TeX-view-program-list '(("Zathura" "zathura-sync %n:1:%b %o")))
   (setq TeX-view-program-selection '((output-pdf "Zathura")))
+
   )
 
 ;; Do not write anything past this comment. This is where Emacs will