diff --git a/app/src/main/java/com/deniscerri/ytdl/page/MoreFragment.java b/app/src/main/java/com/deniscerri/ytdl/page/MoreFragment.java
index 7ac7fa72..e2ec67e4 100644
--- a/app/src/main/java/com/deniscerri/ytdl/page/MoreFragment.java
+++ b/app/src/main/java/com/deniscerri/ytdl/page/MoreFragment.java
@@ -48,7 +48,9 @@ public class MoreFragment extends PreferenceFragmentCompat {
         });
 
         updateApp.setOnPreferenceClickListener(preference -> {
-            updateUtil.updateApp();
+            if(!updateUtil.updateApp()){
+                Toast.makeText(getContext(), R.string.you_are_in_latest_version, Toast.LENGTH_SHORT).show();
+            }
             return true;
         });
     }
diff --git a/app/src/main/java/com/deniscerri/ytdl/page/settings/SettingsFragment.java b/app/src/main/java/com/deniscerri/ytdl/page/settings/SettingsFragment.java
index da2c3522..f00096ce 100644
--- a/app/src/main/java/com/deniscerri/ytdl/page/settings/SettingsFragment.java
+++ b/app/src/main/java/com/deniscerri/ytdl/page/settings/SettingsFragment.java
@@ -225,7 +225,9 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         });
 
         version.setOnPreferenceClickListener(preference -> {
-            updateUtil.updateApp();
+            if(!updateUtil.updateApp()){
+                Toast.makeText(getContext(), R.string.you_are_in_latest_version, Toast.LENGTH_SHORT).show();
+            }
             return true;
         });
 
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.java b/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.java
index 9a743cbb..6b54c94e 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.java
+++ b/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.java
@@ -45,10 +45,10 @@ public class UpdateUtil {
         downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
     }
 
-    public void updateApp(){
+    public boolean updateApp(){
         if (updatingApp) {
             Toast.makeText(context, context.getString(R.string.ytdl_already_updating), Toast.LENGTH_LONG).show();
-            return;
+            return true;
         }
         AtomicReference<JSONObject> res = new AtomicReference<>(new JSONObject());
         try{
@@ -71,8 +71,7 @@ public class UpdateUtil {
         } catch (JSONException ignored) {}
 
         if(version.equals("v"+BuildConfig.VERSION_NAME)){
-            Toast.makeText(context, R.string.you_are_in_latest_version, Toast.LENGTH_SHORT).show();
-            return;
+            return false;
         }
 
         MaterialAlertDialogBuilder updateDialog = new MaterialAlertDialogBuilder(context)
@@ -82,6 +81,8 @@ public class UpdateUtil {
                 .setNegativeButton("Cancel", (dialogInterface, i) -> {})
                 .setPositiveButton("Update", (dialogInterface, i) -> startAppUpdate(res.get()));
         updateDialog.show();
+
+        return true;
     }