1 files changed, 5 insertions, 0 deletions

diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index ea3e0bb..de99e66 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -297,6 +297,11 @@ void SystemTray::addClient(Window win) {
         return;
     }
 
+    WinClient *winclient = Fluxbox::instance()->searchWindow(win);
+    if (winclient && winclient->fbwindow())
+        // remove client from FluxboxWindow first
+        winclient->fbwindow()->restore(winclient, false);
+
     FbTk::FbWindow *traywin = new TrayWindow(win);
 
 #ifdef DEBUG