diff --git a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java
index 7490c1598..81787c04b 100644
--- a/app/src/main/java/org/fdroid/fdroid/NfcHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java
@@ -38,7 +38,7 @@ public class NfcHelper {
     }
 
     @TargetApi(16)
-    static void setAndroidBeam(Activity activity, String packageName) {
+    public static void setAndroidBeam(Activity activity, String packageName) {
         if (Build.VERSION.SDK_INT < 16) {
             return;
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 4717c5d7a..3b1ffdd83 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -10,6 +10,8 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.MenuItem;
 import android.support.v7.widget.RecyclerView;
 
+import org.fdroid.fdroid.FDroidApp;
+import org.fdroid.fdroid.NfcHelper;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.Utils;
@@ -76,10 +78,15 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
     protected void onResume() {
         super.onResume();
 
+        FDroidApp.checkStartTor(this);
+
         if (getIntent().hasExtra(EXTRA_VIEW_MY_APPS)) {
             getIntent().removeExtra(EXTRA_VIEW_MY_APPS);
             pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.my_apps));
         }
+
+        // AppDetails and RepoDetailsActivity set different NFC actions, so reset here
+        NfcHelper.setAndroidBeam(this, getApplication().getPackageName());
     }
 
     @Override