diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/TwitterLinkHandlerActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/TwitterLinkHandlerActivity.java
index 9a29821af..68618a916 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/activity/TwitterLinkHandlerActivity.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/activity/TwitterLinkHandlerActivity.java
@@ -115,6 +115,12 @@ public class TwitterLinkHandlerActivity extends Activity implements Constants {
         finish();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        setVisible(true);
+    }
+
     @NonNull
     private Pair<Intent, Boolean> getHandledIntent(final Uri uri) {
         final List<String> pathSegments = uri.getPathSegments();
@@ -213,7 +219,7 @@ public class TwitterLinkHandlerActivity extends Activity implements Constants {
                     return Pair.create(new Intent(Intent.ACTION_VIEW, builder.build()), true);
                 }
             }
-        } else if (segsSize > 3) {
+        } else if (segsSize >= 3) {
             if ("status".equals(pathSegments.get(1)) && ParseUtils.parseLong(pathSegments.get(2), -1) != -1) {
                 final Uri.Builder builder = new Uri.Builder();
                 builder.scheme(SCHEME_TWIDERE);
diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java
index 33035b210..270620e73 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java
@@ -1200,12 +1200,12 @@ public class ComposeActivity extends ThemedFragmentActivity implements LocationL
      */
     private boolean startLocationUpdateIfEnabled() {
         final LocationManager lm = mLocationManager;
+        try {
+            lm.removeUpdates(this);
+        } catch (SecurityException ignore) {
+        }
         final boolean attachLocation = mPreferences.getBoolean(KEY_ATTACH_LOCATION);
         if (!attachLocation) {
-            try {
-                lm.removeUpdates(this);
-            } catch (SecurityException ignore) {
-            }
             return false;
         }
         final Criteria criteria = new Criteria();
diff --git a/twidere/src/main/res/values/themes.xml b/twidere/src/main/res/values/themes.xml
index dfd7c3072..53f11469e 100644
--- a/twidere/src/main/res/values/themes.xml
+++ b/twidere/src/main/res/values/themes.xml
@@ -3,7 +3,7 @@
 
     <style name="Theme" />
 
-    <style name="Theme.Launcher" parent="android:Theme.NoDisplay">
+    <style name="Theme.Launcher" parent="Theme.Twidere.Dark.NoDisplay">
         <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
     </style>