diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index a89138dab..bc04c1e51 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -1415,7 +1415,7 @@ clutter_text_get_preferred_width (ClutterActor *self,
 
   if (min_width_p)
     {
-      if (priv->wrap || priv->ellipsize)
+      if (priv->wrap || priv->ellipsize || priv->editable)
         *min_width_p = 1;
       else
         *min_width_p = layout_width;