diff --git a/pom.xml b/pom.xml
index 57bf07f84..0fd7aa20e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>3.4</version>
+    <version>3.5</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 4dbac7660..bbeb8b44e 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -48,7 +48,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
  */
 public final class MainPanel {
 
-    public static final String VERSION = "3.4";
+    public static final String VERSION = "3.5";
     public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
     public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
     public static final int STREAMER_PORT = 1337;
@@ -741,7 +741,7 @@ public final class MainPanel {
         }
     }
 
-    public void byebye() {
+    public void byebye(boolean restart) {
 
         if (!_exit && checkByeBye()) {
 
@@ -860,7 +860,12 @@ public final class MainPanel {
                             Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
                         }
 
-                        exit(0);
+                        if (restart) {
+                            restartApplication(1);
+                        } else {
+                            exit(0);
+                        }
+
                     }
 
                 }
@@ -1058,7 +1063,7 @@ public final class MainPanel {
 
                     }
 
-                    byebye();
+                    byebye(false);
 
                 }
 
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index bcd15cd0c..6f23a2fe6 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -866,10 +866,7 @@ public final class MainPanelView extends javax.swing.JFrame {
 
             JOptionPane.showMessageDialog(this, "MegaBasterd will restart", "Restart required", JOptionPane.WARNING_MESSAGE);
 
-            if (_main_panel.checkByeBye()) {
-
-                restartApplication(1);
-            }
+            _main_panel.byebye(true);
         }
 
         if (!dialog.isRemember_master_pass()) {
@@ -896,7 +893,7 @@ public final class MainPanelView extends javax.swing.JFrame {
 
     private void exit_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exit_menuActionPerformed
 
-        _main_panel.byebye();
+        _main_panel.byebye(false);
     }//GEN-LAST:event_exit_menuActionPerformed
 
     private void close_all_finished_down_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_close_all_finished_down_buttonActionPerformed