diff --git a/pom.xml b/pom.xml
index 04333d442..6a6793203 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>6.35</version>
+    <version>6.36</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 9b9652e10..91043fa96 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -50,7 +50,7 @@ import javax.swing.UIManager;
  */
 public final class MainPanel {
 
-    public static final String VERSION = "6.35";
+    public static final String VERSION = "6.36";
     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;
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index 8646a0398..345f8061c 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -358,14 +358,24 @@ public final class MainPanelView extends javax.swing.JFrame implements FileDropH
             @Override
             public void run() {
 
-                Object[] options = {LabelTranslatorSingleton.getInstance().translate("Split content in different uploads"), LabelTranslatorSingleton.getInstance().translate("Merge content in the same upload")};
+                int n;
 
-                int n = showOptionDialog(_main_panel.getView(),
-                        LabelTranslatorSingleton.getInstance().translate("How do you want to proceed?"),
-                        LabelTranslatorSingleton.getInstance().translate("File Grabber"), DEFAULT_OPTION, INFORMATION_MESSAGE,
-                        null,
-                        options,
-                        null);
+                if (files.size() > 1) {
+
+                    Object[] options = {LabelTranslatorSingleton.getInstance().translate("Split content in different uploads"), LabelTranslatorSingleton.getInstance().translate("Merge content in the same upload")};
+
+                    n = showOptionDialog(_main_panel.getView(),
+                            LabelTranslatorSingleton.getInstance().translate("How do you want to proceed?"),
+                            LabelTranslatorSingleton.getInstance().translate("File Grabber"), DEFAULT_OPTION, INFORMATION_MESSAGE,
+                            null,
+                            options,
+                            null);
+
+                } else {
+
+                    n = 1;
+
+                }
 
                 if (n == 0) {
 
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index f2fdda399..a15fd1283 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ