diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 56dc780e9f..b831759149 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -740,7 +740,7 @@ void RowPainter::paintOnlyInsets()
 {
 	pos_type const end = row_.endpos();
 	for (pos_type pos = row_.pos(); pos != end; ++pos) {
-		if (!par_.isInset(pos))
+		if (!par_.isInset(pos) || par_.isHfill(pos))
 			continue;
 
 		if (x_ > bv_.workWidth())
diff --git a/status.15x b/status.15x
index da9265ae94..2e9c5c8eb2 100644
--- a/status.15x
+++ b/status.15x
@@ -139,6 +139,9 @@ What's new
 - Fix a crash when the cursor leaves the first paragraph of the
   appendix and it is empty (bug 4352).
 
+- Fix a crash when editing in an inset that contains an horizontal spring 
+  (hfill).
+
 - Fix a crash when pasting text from the clipboard into a multi-line
   tabular cell (bug 4368).