diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 91a173a3a5..3769627f68 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -490,7 +490,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		first = row.endpos();
 		++row_index;
 
-		pm.dim().wid = max(pm.dim().wid, row.width());
+		pm.dim().wid = max(pm.dim().wid, row.width() + row.right_margin);
 		pm.dim().des += row.height();
 	} while (first < par.size() || need_new_row);
 
diff --git a/status.23x b/status.23x
index 4f282fa68b..fd6995ed25 100644
--- a/status.23x
+++ b/status.23x
@@ -64,6 +64,8 @@ What's new
 
 - Fix width of collapsible insets with sublabels (bug 12046).
 
+- Fix Hebrew characters overflow in insets (bug 12030).
+
 
 * INTERNALS