diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 20d6765d2..8c0e5f7b8 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1531,6 +1531,7 @@ Other:
 - Revert setting company min. prefix length to 0 for company-web backend
   (thanks to Dela Anthonio)
 - Added missing prefixes for =web-mode= and =css-mode= (thanks to Uroš Perišić)
+- Fixed ~TAB~ indenting in =web-mode= (thanks to Christopher Eames)
 **** Hy
 - Added support for virtual envs (thanks to Danny Freeman)
 - Key bindings:
diff --git a/layers/+lang/html/funcs.el b/layers/+lang/html/funcs.el
index 5edeb776e..bda8618ab 100644
--- a/layers/+lang/html/funcs.el
+++ b/layers/+lang/html/funcs.el
@@ -11,9 +11,10 @@
 
 (defun spacemacs/emmet-expand ()
   (interactive)
-  (if (bound-and-true-p yas-minor-mode)
-      (call-interactively 'emmet-expand-yas)
-    (call-interactively 'emmet-expand-line)))
+  (unless (if (bound-and-true-p yas-minor-mode)
+              (call-interactively 'emmet-expand-yas)
+            (call-interactively 'emmet-expand-line))
+    (indent-for-tab-command)))
 
 (defun spacemacs/impatient-mode ()
   (interactive)