diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23c17a53..df43c48f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,8 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
     <application
         android:name="HabitsApplication"
         android:allowBackup="true"
@@ -154,7 +156,11 @@
                 android:resource="@xml/widget_frequency_info"/>
         </receiver>
 
-        <receiver android:name=".HabitBroadcastReceiver"/>
+        <receiver android:name=".HabitBroadcastReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
 
     </application>
 
diff --git a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
index c3154651..435e26ee 100644
--- a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
+++ b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
@@ -57,7 +57,7 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
         {
             case ACTION_SHOW_REMINDER:
                 createNotification(context, intent);
-                createReminderAlarms(context);
+                createReminderAlarmsDelayed(context);
                 break;
 
             case ACTION_DISMISS:
@@ -71,10 +71,14 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
             case ACTION_SNOOZE:
                 snoozeHabit(context, intent);
                 break;
+
+            case Intent.ACTION_BOOT_COMPLETED:
+                ReminderHelper.createReminderAlarms(context);
+                break;
         }
     }
 
-    private void createReminderAlarms(final Context context)
+    private void createReminderAlarmsDelayed(final Context context)
     {
         new Handler().postDelayed(new Runnable()
         {