diff --git a/src/logic/Application.swift b/src/logic/Application.swift
index f6e647f4..aa47d44a 100644
--- a/src/logic/Application.swift
+++ b/src/logic/Application.swift
@@ -79,7 +79,7 @@ class Application: NSObject {
                             DispatchQueue.main.async { [weak self] in
                                 guard let self = self else { return }
                                 if let window = (Windows.list.first { $0.isEqualRobust(axWindow, wid) }) {
-                                    window.title = title
+                                    window.title = window.bestEffortTitle(title)
                                     window.size = size
                                     window.isFullscreen = isFullscreen
                                     window.isMinimized = isMinimized
diff --git a/src/logic/events/AccessibilityEvents.swift b/src/logic/events/AccessibilityEvents.swift
index 82cfc84b..6fd53441 100644
--- a/src/logic/events/AccessibilityEvents.swift
+++ b/src/logic/events/AccessibilityEvents.swift
@@ -165,9 +165,8 @@ fileprivate func windowTitleChanged(_ element: AXUIElement, _ pid: pid_t) throws
     if let wid = try element.cgWindowId() {
         let newTitle = try element.title()
         DispatchQueue.main.async {
-            if let window = (Windows.list.first { $0.isEqualRobust(element, wid) }),
-               newTitle != nil && newTitle != window.title {
-                window.title = newTitle!
+            if let window = (Windows.list.first { $0.isEqualRobust(element, wid) }), newTitle != window.title {
+                window.title = window.bestEffortTitle(newTitle)
                 App.app.refreshOpenUi([window])
             }
         }