diff --git a/Pinta.Tools/Tools/TextTool.cs b/Pinta.Tools/Tools/TextTool.cs
index 2ae88f43f3..cfb635af0b 100644
--- a/Pinta.Tools/Tools/TextTool.cs
+++ b/Pinta.Tools/Tools/TextTool.cs
@@ -295,6 +295,14 @@ protected override void OnBuildToolBar (Gtk.Box tb)
 		outline_width.Visible = outline_width_label.Visible = outline_sep.Visible = StrokeText;
 
 		UpdateFont ();
+
+		if (workspace.HasOpenDocuments) {
+			//Make sure the event handler is never added twice.
+			workspace.ActiveDocument.LayerCloned -= FinalizeText;
+
+			//When an ImageSurface is Cloned, finalize the re-editable text (if applicable).
+			workspace.ActiveDocument.LayerCloned += FinalizeText;
+		}
 	}
 
 	protected override void OnSaveSettings (ISettingsService settings)