diff --git a/emacs/data.el b/emacs/data.el
index 27de720..0fa60fd 100644
--- a/emacs/data.el
+++ b/emacs/data.el
@@ -33,6 +33,10 @@
               standard-indent  2
               tab-width        2))
 
+(defun agw-cc-mode ()
+  "Sets up `c-mode' and `c++-mode'."
+  (c-toggle-electric-state -1))
+
 (defun agw-before-save ()
   "Hook to be run before saving a file."
   (unless agw-no-fixes
diff --git a/emacs/init.el b/emacs/init.el
index 8f2ac9c..709e40a 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -128,6 +128,8 @@
   (defvaralias 'python-indent-offset 'tab-width))
 
 (use-package cc-mode
+  :hook ((  c-mode . agw-cc-mode)
+         (c++-mode . agw-cc-mode))
   :mode (("\\.zsc\\'" . c-mode)
          ("\\.zc\\'"  . c-mode))
   :init