diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 673fef9..6e5832a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1839,7 +1839,7 @@
             final boolean isSafeMode = manager.isSafeMode();
             final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
             final boolean isSdCardReady = context.registerReceiver(null,
-                    new IntentFilter(StartupReceiver.SYESTEM_READY)) != null;
+                    new IntentFilter(StartupReceiver.SYSTEM_READY)) != null;
 
             LauncherAppState app = LauncherAppState.getInstance();
             DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
@@ -2267,7 +2267,7 @@
 
                 if (!isSdCardReady && !sPendingPackages.isEmpty()) {
                     context.registerReceiver(new AppsAvailabilityCheck(),
-                            new IntentFilter(StartupReceiver.SYESTEM_READY),
+                            new IntentFilter(StartupReceiver.SYSTEM_READY),
                             null, sWorker);
                 }
 
diff --git a/src/com/android/launcher3/StartupReceiver.java b/src/com/android/launcher3/StartupReceiver.java
index 4499917..65f913f 100644
--- a/src/com/android/launcher3/StartupReceiver.java
+++ b/src/com/android/launcher3/StartupReceiver.java
@@ -6,10 +6,10 @@
 
 public class StartupReceiver extends BroadcastReceiver {
 
-    static final String SYESTEM_READY = "com.android.launcher3.SYESTEM_READY";
+    static final String SYSTEM_READY = "com.android.launcher3.SYSTEM_READY";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        context.sendStickyBroadcast(new Intent(SYESTEM_READY));
+        context.sendStickyBroadcast(new Intent(SYSTEM_READY));
     }
 }
