2 files changed, 7 insertions, 1 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index b80c4cf..502c92c 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -220,6 +220,9 @@ void Ewmh::setupClient(WinClient &winclient) {
     if (!newtitle.empty()) {
         winclient.setIconTitle(newtitle);
     }
+
+    if ( winclient.fbwindow() )
+        winclient.fbwindow()->titleSig().notify();
 }
 
 void Ewmh::setupFrame(FluxboxWindow &win) {
@@ -913,11 +916,15 @@ bool Ewmh::propertyNotify(WinClient &winclient, Atom the_property) {
         FbTk::FbString newtitle = winclient.textProperty(the_property);
         if (!newtitle.empty())
             winclient.setTitle(newtitle);
+        if (winclient.fbwindow())
+            winclient.fbwindow()->titleSig().notify();
         return true;
     } else if (the_property == m_net_wm_icon_name) {
         FbTk::FbString newtitle = winclient.textProperty(the_property);
         if (!newtitle.empty())
             winclient.setIconTitle(newtitle);
+        if (winclient.fbwindow())
+            winclient.fbwindow()->titleSig().notify();
         return true;
     }
 
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 9317c81..acb8250 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -355,7 +355,6 @@ void WinClient::setTitle(FbTk::FbString &title) {
     m_title_override = true;
     if (m_win)
         m_win->updateTitleFromClient(*this);
-    m_title_override = false;
 }
 
 void WinClient::setIconTitle(FbTk::FbString &icon_title) {