diff --git a/haskell-indentation.el b/haskell-indentation.el
index 3f5c52889..601b6d4f8 100644
--- a/haskell-indentation.el
+++ b/haskell-indentation.el
@@ -1152,8 +1152,9 @@ layout starts."
   ;; put `haskell-indentation-read-next-token' outside the current-indent
   ;; definition so it will not return 'layout-end again
   (when (eq current-token 'layout-end)
-    ;; leave layout at 'layout-end or illegal token
-    (haskell-indentation-read-next-token)))
+    (let ((implicit-layout-active t))
+      ;; leave layout at 'layout-end or illegal token
+      (haskell-indentation-read-next-token))))
 
 (defun haskell-indentation-if ()
   "" ; FIXME
diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el
index ee4992e6a..23b0ae795 100644
--- a/tests/haskell-indentation-tests.el
+++ b/tests/haskell-indentation-tests.el
@@ -646,8 +646,8 @@ az = Projection
 "
 	      ((6 0) 2))
 
-(hindent-test "36* yet another parser failure" "
-tokOpenTag = 
+(hindent-test "36 yet another parser failure" "
+tokOpenTag =
   asum [ do void
        , return
        ]