diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index d177ba2e8a..29281f0348 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3370,10 +3370,10 @@ gtk_entry_draw_frame (GtkWidget      *widget,
                       widget, "entry_bg",
                       x, y, width, height);
 
-  gtk_paint_shadow (style, cr,
-                    state, priv->shadow_type,
-                    widget, "entry", x, y, width, height);
-
+  if (GTK_ENTRY (widget)->has_frame)
+    gtk_paint_shadow (style, cr,
+                      state, priv->shadow_type,
+                      widget, "entry", x, y, width, height);
 
   gtk_entry_draw_progress (widget, cr);