diff --git a/src/org/thoughtcrime/securesms/RoutingActivity.java b/src/org/thoughtcrime/securesms/RoutingActivity.java
index b4001e1133..b2e04f270a 100644
--- a/src/org/thoughtcrime/securesms/RoutingActivity.java
+++ b/src/org/thoughtcrime/securesms/RoutingActivity.java
@@ -122,17 +122,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     final ConversationParameters parameters = getConversationParameters();
     final Intent intent;
 
+    scheduleRefreshActions();
 
     if      (isShareAction())               intent = getShareIntent(parameters);
     else if (parameters.recipients != null) intent = getConversationIntent(parameters);
     else                                    intent = getConversationListIntent();
 
-    if (TextSecurePreferences.isPushRegistered(this) &&
-        !TextSecurePreferences.isSignedPreKeyRegistered(this))
-    {
-      PreKeyService.initiateCreateSigned(this, masterSecret);
-    }
-
     startActivity(intent);
     finish();
   }
@@ -185,6 +180,12 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
       Intent intent = new Intent(this, GcmRegistrationService.class);
       startService(intent);
     }
+
+    if (TextSecurePreferences.isPushRegistered(this) &&
+        !TextSecurePreferences.isSignedPreKeyRegistered(this))
+    {
+      PreKeyService.initiateCreateSigned(this, masterSecret);
+    }
   }
 
   private int getApplicationState() {