diff --git a/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java b/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java
index 35e0ce3..d6783c1 100644
--- a/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java
+++ b/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java
@@ -128,6 +128,7 @@
             @Override
             public void actionPerformed(ActionEvent e) {
                 loadInstances();
+                checkLauncherUpdate();
             }
         });
 
@@ -167,6 +168,10 @@
     }
 
     private void checkLauncherUpdate() {
+        if (SelfUpdater.updatedAlready) {
+            return;
+        }
+
         ListenableFuture<URL> future = launcher.getExecutor().submit(new UpdateChecker(launcher));
 
         Futures.addCallback(future, new FutureCallback<URL>() {
diff --git a/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java b/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java
index 76d95cb..92af33c 100644
--- a/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java
+++ b/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java
@@ -23,6 +23,8 @@
 
 public class SelfUpdater implements Callable<File>, ProgressObservable {
 
+    public static boolean updatedAlready = false;
+
     private final Launcher launcher;
     private final URL url;
     private final Installer installer;
@@ -51,6 +53,8 @@
             progress = installer;
             installer.execute();
 
+            updatedAlready = true;
+
             return file;
         } finally {
             executor.shutdownNow();