diff --git a/src/HexManiac.Core/ViewModels/Tools/ToolTray.cs b/src/HexManiac.Core/ViewModels/Tools/ToolTray.cs
index 32c5778d..6dda3959 100644
--- a/src/HexManiac.Core/ViewModels/Tools/ToolTray.cs
+++ b/src/HexManiac.Core/ViewModels/Tools/ToolTray.cs
@@ -126,6 +126,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
       }
 
       public void RefreshContent() {
+         StringTool.DataForCurrentRunChanged();
          TableTool.DataForCurrentRunChanged();
          SpriteTool.DataForCurrentRunChanged();
       }
diff --git a/src/HexManiac.Tests/Before_Baseclass/ChangeHistoryTests.cs b/src/HexManiac.Tests/Before_Baseclass/ChangeHistoryTests.cs
index 483441ad..c4ea5fb6 100644
--- a/src/HexManiac.Tests/Before_Baseclass/ChangeHistoryTests.cs
+++ b/src/HexManiac.Tests/Before_Baseclass/ChangeHistoryTests.cs
@@ -365,5 +365,15 @@ namespace HavenSoft.HexManiac.Tests {
 
          Assert.True(watcher.LastCanExecute);
       }
+
+      [Fact]
+      public void ChangeTextWithTextTool_Undo_TextToolUpdates() {
+         ViewPort.Edit("FF @00 ^text\"\" Test\" @00 ");
+         ViewPort.Tools.StringTool.Content = "Blah";
+
+         ViewPort.Undo.Execute();
+
+         Assert.Equal("Test", ViewPort.Tools.StringTool.Content);
+      }
    }
 }