diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index e480f62ca8..84aac79253 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -551,6 +551,13 @@ gimp_text_tool_button_press (GimpTool            *tool,
 
               if (text_tool->text && text_tool->text != text)
                 {
+                  if (text_tool->style_overlay)
+                    {
+                      gtk_widget_destroy (text_tool->style_overlay);
+                      text_tool->style_overlay = NULL;
+                      text_tool->style_editor  = NULL;
+                    }
+
                   gimp_text_tool_editor_start (text_tool);
                 }
             }