diff --git a/src/client.cc b/src/client.cc
index 43c35ca8..9fd1416e 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -47,21 +47,19 @@ Client::Client(int screen, Window window)
   _urgent = false;
   _positioned = false;
   _disabled_decorations = 0;
-  _modal = false;
   _modal_child = 0;
   _group = None;
   _desktop = 0;
   
   getArea();
   getDesktop();
+  getState();  // do this before updateTransientFor! (for _modal)
+  getShaped();
 
   updateTransientFor();
   getMwmHints();
   getType(); // this can change the mwmhints for special cases
 
-  getState();
-  getShaped();
-
   updateProtocols();
 
   getGravity();        // get the attribute gravity