diff --git a/src/main/java/com/xmage/launcher/XMageLauncher.java b/src/main/java/com/xmage/launcher/XMageLauncher.java
index 5ce282b..032fe23 100644
--- a/src/main/java/com/xmage/launcher/XMageLauncher.java
+++ b/src/main/java/com/xmage/launcher/XMageLauncher.java
@@ -697,6 +697,7 @@ protected Void doInBackground() {
 
         private boolean updateJava() {
             try {
+                disableButtons();
                 File javaFolder = new File(path.getAbsolutePath() + File.separator + "java");
                 String javaAvailableVersion = (String)config.getJSONObject("java").get(("version"));
                 if (javaFolder.isDirectory()) {  //remove existing install
@@ -739,6 +740,7 @@ private boolean updateJava() {
         
         private boolean updateXMage() {
             try {
+                disableButtons();
                 File xmageFolder = new File(path.getAbsolutePath() + File.separator + "xmage");
                 String xmageAvailableVersion = (String)config.getJSONObject("XMage").get(("version"));
                 String xmageRemoteLocation;