diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 40553d9b0..09e353e77 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,8 @@
         <activity
             android:name=".ui.main.MainActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/activity_dashboard_text" />
+            android:label="@string/activity_dashboard_text"
+            android:launchMode="singleTop" />
 
         <service
             android:name=".services.jobs.SyncJob"
diff --git a/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java b/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
index db586d2f7..94d5eb51f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
+++ b/app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java
@@ -95,7 +95,7 @@ public class SyncJob extends SimpleJobService {
                 .setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0,
                         MainActivity.getStartIntent(getApplicationContext())
                                 .putExtra(MainActivity.EXTRA_CARD_ID_KEY, 0)
-                        , 0
+                        , PendingIntent.FLAG_UPDATE_CURRENT
                 ))
                 .build());
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java b/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java
index bfb6292c6..b5e5a8998 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/TimetableWidgetProvider.java
@@ -57,7 +57,7 @@ public class TimetableWidgetProvider extends AppWidgetProvider {
     private void setToggleIntent(RemoteViews views, Context context) {
         Intent refreshIntent = new Intent(context, TimetableWidgetProvider.class);
         refreshIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0,
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 1,
                 refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT);
         views.setOnClickPendingIntent(R.id.timetable_widget_toggle, pendingIntent);
     }