2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a43f8b0..b5fdc78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
 *07/12/18:
+   * Open transient windows on same workspace as parent (thanks Sascha Hunold)
+     Window.cc
    * Holding control while clicking on a menu item will now keep the menu open (Mark)
      FbTk/Menu.cc MenuItem.cc/hh
 *07/12/17:
diff --git a/src/Window.cc b/src/Window.cc
index 65afd67..801a97c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -498,6 +498,16 @@ void FluxboxWindow::init() {
         layerItem().setLayer(m_client->transientFor()->fbwindow()->layerItem().getLayer());
     else // if no parent then set default layer
         moveToLayer(m_layernum, m_layernum != ::Layer::NORMAL);
+    
+    // transients should be on the same workspace as parent
+    if (m_client->isTransient() &&
+        m_client->transientFor()->fbwindow() &&
+        m_client->transientFor()->fbwindow() != this) {
+        m_workspace_number =
+                m_client->transientFor()->fbwindow()->workspaceNumber();
+    }
+    
+    
 #ifdef DEBUG
     cerr<<"FluxboxWindow::init("<<title()<<") transientFor: "<<
         m_client->transientFor()<<endl;