diff --git a/src/text_editor/commands_window.cpp b/src/text_editor/commands_window.cpp
index e8e23f0..695b15a 100644
--- a/src/text_editor/commands_window.cpp
+++ b/src/text_editor/commands_window.cpp
@@ -322,6 +322,8 @@ void ApplyTitleBarChangesToWindow(Window *window, View *view, Buffer *buffer) {
     if (GetFront(caret) != buffer_pos) {
         caret = MakeCaret(buffer_pos);
     }
+
+    window->title_bar_last_buffer_change_id = buffer->change_id;
 }
 
 void ReplaceTitleBarData(Window *window) {
@@ -329,7 +331,9 @@ void ReplaceTitleBarData(Window *window) {
     view->scroll.y = 0;
     Buffer *buffer = GetBuffer(view->active_buffer);
     if (IsActive(window)) {
-        ApplyTitleBarChangesToWindow(window, view, buffer);
+        if (buffer->change_id != window->title_bar_last_buffer_change_id) {
+            ApplyTitleBarChangesToWindow(window, view, buffer);
+        }
         return;
     }