1 files changed, 5 insertions, 0 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m
index cdf4b4e..61fb85d 100644
--- a/tikzit/src/gtk/Application.m
+++ b/tikzit/src/gtk/Application.m
@@ -345,6 +345,8 @@ Application* app = nil;
                                                   object:window];
     if ([openWindows count] == 0) {
         gtk_main_quit();
+    } else {
+        [self setActiveWindow:[openWindows objectAtIndex:0]];
     }
 }
 
@@ -374,6 +376,9 @@ Application* app = nil;
 
     [contextWindow setDocument:[window document]];
 
+    [contextWindow setTransientFor:window];
+    [toolBox setTransientFor:window];
+
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(windowDocumentChanged:)