diff --git a/src/WinClient.cc b/src/WinClient.cc
index 891dc26f..82027da1 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -353,6 +353,8 @@ void WinClient::updateTitle() {
 void WinClient::setTitle(FbTk::FbString &title) {
     m_title = title;
     m_title_override = true;
+    if (m_win)
+        m_win->updateTitleFromClient(*this);
 }
 
 void WinClient::setIconTitle(FbTk::FbString &icon_title) {
diff --git a/src/Window.cc b/src/Window.cc
index 60ecaca4..cbcb1f7d 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1158,6 +1158,8 @@ void FluxboxWindow::updateTitleFromClient(WinClient &client) {
         m_labelbuttons[&client]->setText(client.title());
         if (&client == m_client)
             frame().setFocusTitle(client.title());
+
+        titleSig().notify();
     }
 }
 
@@ -2515,7 +2517,6 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
         client.updateIconTitle();
     case XA_WM_NAME:
         updateTitleFromClient(client);
-        titleSig().notify();
         break;
 
     case XA_WM_NORMAL_HINTS: {