diff --git a/Mac/Controller.m b/Mac/Controller.m
index a3c267a..9612ed0 100644
--- a/Mac/Controller.m
+++ b/Mac/Controller.m
@@ -267,6 +267,12 @@
     return NO;
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag
+{
+    [timelineViewWindow makeKeyAndOrderFront:self];
+    return NO;
+}
+
 - (IBAction)openNewMessageWindow:(id)sender
 {
 	[NSApp activateIgnoringOtherApps:YES];