diff --git a/layout.sty b/layout.sty
index ac9d6c5f1a5b1b9bb7c6c98de38fbc2b614cc23e..88ced07ee73e1e3bd11201f852e1bb981a19f42e 100644
--- a/layout.sty
+++ b/layout.sty
@@ -585,7 +585,8 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
   before={\vspace{.5em}\noindent},
   fonttitle={\scshape #1},
   before upper={\parindent15pt\afterparnoindent},
-  after upper={\iftoggle{verbose}{}{\par What do you do?}\noindent},
+  after upper={\iftoggle{verbose}{}{\par What do you do?}},
+  after={\afterparnoindent},
 }
 
 \newcommand{\sidebox}[2][23]{
@@ -947,10 +948,10 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 
  \newif\ifafterpar
  \newcommand\afterparnoindent{%
-   \afterpartrue
-   \everypar{%
+   \global\afterpartrue
+   \global\everypar{%
      \ifafterpar
-       \afterparfalse
+       \global\afterparfalse
        {\setbox\z@\lastbox}%
      \else
        \everypar{}%
@@ -972,7 +973,10 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \newenvironment{speechtext}%
   {\it
   \begin{quotation}}%
-  {\end{quotation}}
+  {
+    \end{quotation}
+    \afterparnoindent
+  }
 
 \newenvironment{exampletext}
   {
@@ -980,7 +984,6 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
     \needspace{2em}
     \vspace{1em}%
     \it%
-    \afterparnoindent
   }
   {%
     \par