diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9fc8d6f8cc..31e082644c 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1074,10 +1074,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		Paragraph const & prevpar = pit > 0 ? pars_[pit - 1] : par;
 		if (pit > 0 && cur.pos() == par.beginOfBody()
 		    && !par.isEnvSeparator(cur.pos())
+		    && !par.layout().isCommand()
 		    && ((prevpar.getDepth() > par.getDepth()
 			 && !par.layout().isEnvironment())
 			|| (prevpar.layout() != par.layout()
-			    && !par.layout().isCommand()
 			    && prevpar.layout().isEnvironment()))) {
 			if (par.layout().isEnvironment()) {
 				docstring const layout = par.layout().name();