1 files changed, 6 insertions, 1 deletions
diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index 4cd7f2d..b38168c 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -16,6 +16,7 @@
 #import "User.h"
 #import "DeviceRegistration.h"
 #import "NewPostViewController.h"
+#import "DiscoverViewController.h"
 
 @interface AppDelegate()
 -(void) parseNotificationPayload:(NSDictionary *)userInfo;
@@ -82,7 +83,11 @@
     NSDictionary *userInfo = response.notification.request.content.userInfo;
     NSLog(@"User Info : %@", userInfo);
     [self parseNotificationPayload:userInfo];
-    [self.window.rootViewController performSegueWithIdentifier:@"threadSegue" sender:self.window.rootViewController];
+    UINavigationController *main = (UINavigationController *)self.window.rootViewController;
+    [main popToRootViewControllerAnimated:YES];
+    if ([main.visibleViewController isKindOfClass:[DiscoverViewController class]]) {
+        [main.visibleViewController performSegueWithIdentifier:@"threadViewSegue" sender:main.visibleViewController];
+    }
     completionHandler();
 }