diff --git a/src/Text.cpp b/src/Text.cpp
index 328eb55f1d..01d1ab0efe 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -267,11 +267,13 @@ Font const Text::outerFont(pit_type par_offset) const
 {
 	depth_type par_depth = pars_[par_offset].getDepth();
 	FontInfo tmpfont = inherit_font;
-
+	depth_type prev_par_depth = 0;
 	// Resolve against environment font information
 	while (par_offset != pit_type(pars_.size())
+	       && par_depth != prev_par_depth
 	       && par_depth
 	       && !tmpfont.resolved()) {
+		prev_par_depth = par_depth;
 		par_offset = outerHook(par_offset);
 		if (par_offset != pit_type(pars_.size())) {
 			tmpfont.realize(pars_[par_offset].layout().font);
diff --git a/src/Text.h b/src/Text.h
index 6068025192..fb534585ee 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -323,9 +323,14 @@ public:
 	bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/);
 	///
 	docstring completionPrefix(Cursor const & cur) const;
-	/// for the environments
+	/// find a paragraph before \p par with the given \p depth, if such
+	/// a paragraph cannot be found, \p par is returned
 	pit_type depthHook(pit_type par, depth_type depth) const;
-	///
+	/// find a paragraph before \p par with depth less than the
+	/// depth of \p par. If such paragraph cannot be found because
+	/// \p par already has depth 0, lastpar + 1 is returned. If
+	/// such paragraph cannot be found because there isn't a par
+	/// with less depth before this one, \p par is returned.
 	pit_type outerHook(pit_type par) const;
 	/// Is it the first par with same depth and layout?
 	bool isFirstInSequence(pit_type par) const;