diff --git a/app/build.gradle b/app/build.gradle
index e322430..2ca9262 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "us.spotco.malwarescanner"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 25
-        versionName "2.1"
+        versionCode 26
+        versionName "2.2"
     }
     buildTypes {
         debug {
diff --git a/app/src/main/java/us/spotco/malwarescanner/EventReceiver.java b/app/src/main/java/us/spotco/malwarescanner/EventReceiver.java
index 0478572..8bcf6ec 100644
--- a/app/src/main/java/us/spotco/malwarescanner/EventReceiver.java
+++ b/app/src/main/java/us/spotco/malwarescanner/EventReceiver.java
@@ -3,7 +3,6 @@ package us.spotco.malwarescanner;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 
 import java.io.File;
@@ -15,11 +14,11 @@ public class EventReceiver extends BroadcastReceiver {
     @Override
     public final void onReceive(Context context, Intent intent) {
         if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
-            considerStartService(context);
+            Utils.considerStartService(context);
         }
         if (intent.getAction().equals(Intent.ACTION_PACKAGE_REPLACED)) {
             if (intent.getDataString().contains(context.getPackageName())) {
-                considerStartService(context); //We've been updated, restart service
+                Utils.considerStartService(context); //We've been updated, restart service
             } else {
                 //scanApp(context, intent.getDataString());//An app was updated, scan it
             }
@@ -29,18 +28,6 @@ public class EventReceiver extends BroadcastReceiver {
         }
     }
 
-    private static void considerStartService(Context context) {
-        if (!Utils.isServiceRunning(MalwareScannerService.class, context)) {
-            SharedPreferences prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
-            boolean autostart = prefs.getBoolean("autostart", false);
-
-            if (autostart) {
-                Intent realtimeScanner = new Intent(context, MalwareScannerService.class);
-                context.startService(realtimeScanner);
-            }
-        }
-    }
-
     private static void scanApp(Context context, String appID) {
         if (Utils.isServiceRunning(MalwareScannerService.class, context)) {
             THashSet<File> filesToScan = new THashSet<>();
diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
index b6b1497..d792133 100644
--- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
+++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
@@ -72,6 +72,8 @@ public class MainActivity extends AppCompatActivity {
         });
 
         requestPermissions();
+
+        Utils.considerStartService(this);
     }
 
     @Override
diff --git a/app/src/main/java/us/spotco/malwarescanner/Utils.java b/app/src/main/java/us/spotco/malwarescanner/Utils.java
index 4d422a6..ced254d 100644
--- a/app/src/main/java/us/spotco/malwarescanner/Utils.java
+++ b/app/src/main/java/us/spotco/malwarescanner/Utils.java
@@ -2,6 +2,8 @@ package us.spotco.malwarescanner;
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 
 import java.io.File;
 import java.util.concurrent.Executors;
@@ -65,4 +67,16 @@ class Utils {
         return false;
     }
 
+    public static void considerStartService(Context context) {
+        if (!Utils.isServiceRunning(MalwareScannerService.class, context)) {
+            SharedPreferences prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
+            boolean autostart = prefs.getBoolean("autostart", false);
+
+            if (autostart) {
+                Intent realtimeScanner = new Intent(context, MalwareScannerService.class);
+                context.startService(realtimeScanner);
+            }
+        }
+    }
+
 }
\ No newline at end of file