diff --git a/Tusker/Shortcuts/UserActivityManager.swift b/Tusker/Shortcuts/UserActivityManager.swift
index b9db59cc..c3141a18 100644
--- a/Tusker/Shortcuts/UserActivityManager.swift
+++ b/Tusker/Shortcuts/UserActivityManager.swift
@@ -35,7 +35,7 @@ class UserActivityManager {
     static func handleNewPost(activity: NSUserActivity) {
         // TODO: check not currently showing compose screen
         let mentioning = activity.userInfo?["mentioning"] as? String
-        present(ComposeViewController(mentioningAcct: mentioning))
+        present(UINavigationController(rootViewController: ComposeViewController(mentioningAcct: mentioning)))
     }
     
     // MARK: - Check Notifications
@@ -49,7 +49,7 @@ class UserActivityManager {
     
     static func handleCheckNotifications(activity: NSUserActivity) {
         let tabBarController = UIApplication.shared.keyWindow!.rootViewController! as! UITabBarController
-        tabBarController.selectedIndex = 2
+        tabBarController.selectedIndex = 1
     }
     
 }