diff --git a/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt b/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt
index fb48d3f70..2967ca0a8 100644
--- a/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt
+++ b/app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt
@@ -175,6 +175,15 @@ class NewVersionWorker(
          */
         @JvmStatic
         fun enqueueNewVersionCheckingWork(context: Context, isManual: Boolean) {
+            if (isManual) {
+                ContextCompat.getMainExecutor(context).execute {
+                    Toast.makeText(
+                        context,
+                        R.string.checking_updates_toast,
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            }
             val workRequest = OneTimeWorkRequestBuilder<NewVersionWorker>()
                 .setInputData(workDataOf(IS_MANUAL to isManual))
                 .build()
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index 8923972b0..8a422ee9f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe.settings;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.widget.Toast;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
@@ -25,7 +24,6 @@ public class UpdateSettingsFragment extends BasePreferenceFragment {
     };
 
     private final Preference.OnPreferenceClickListener manualUpdateClick = preference -> {
-        Toast.makeText(getContext(), R.string.checking_updates_toast, Toast.LENGTH_SHORT).show();
         NewVersionWorker.enqueueNewVersionCheckingWork(requireContext(), true);
         return true;
     };