diff --git a/contrib/syntax-checking/config.el b/contrib/syntax-checking/config.el
index 1d3a27b23..272e5bcb1 100644
--- a/contrib/syntax-checking/config.el
+++ b/contrib/syntax-checking/config.el
@@ -15,6 +15,9 @@
 (defvar syntax-checking-enable-tooltips t
   "If non nil some feedback are displayed in tooltips.")
 
+(defvar syntax-checking-check-on-buffer-change nil
+  "If non nil check syntax on idle and upon entering a newline, in addition to upon enabling flycheck-mode and upon saving the buffer.")
+
 ;; Command Prefixes
 
 (spacemacs/declare-prefix "S" "spelling")
diff --git a/contrib/syntax-checking/packages.el b/contrib/syntax-checking/packages.el
index 41dabedb7..96219dfd2 100644
--- a/contrib/syntax-checking/packages.el
+++ b/contrib/syntax-checking/packages.el
@@ -24,8 +24,12 @@
     :defer t
     :init
     (progn
-      (setq flycheck-check-syntax-automatically '(save mode-enabled)
-            flycheck-standard-error-navigation nil)
+      (if syntax-checking-check-on-buffer-change
+          (setq flycheck-check-syntax-automatically
+              '(save idle-change new-line mode-enabled))
+        (setq flycheck-check-syntax-automatically
+                '(save mode-enabled)))
+      (setq flycheck-standard-error-navigation nil)
       (spacemacs|add-toggle syntax-checking
                             :status flycheck-mode
                             :on (flycheck-mode)