diff --git a/src/js/control-view.js b/src/js/control-view.js
index 72e2708..9c649e2 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -205,9 +205,18 @@ module.exports = {
     },
     gcode_files: function () {
       let files = [];
-      files = this.config.gcode_list
-        .find(item => item.name == this.state.folder || "")
-        .files.map(item => item.file_name);
+      if (!this.state.folder || this.state.folder == "") {
+        return files;
+      }
+      if (this.state.folder == "unorganized files") {
+        files = this.config.gcode_list.map(item => {
+          if (item.type == "file") {
+            return item.name;
+          }
+        });
+        return files;
+      }
+      files = this.config.gcode_list.find(item => item.name == this.state.folder).files.map(item => item.file_name);
       // const filesWithNoMacros = this.state.files.filter(
       //   item => !this.config.macros_list.some(compareItem => compareItem.file_name == item),
       // );
@@ -217,7 +226,7 @@ module.exports = {
       return files;
     },
     gcode_folders: function () {
-      let folders = [];
+      let folders = ["unorganized files"];
       for (let item of this.config.gcode_list) {
         if (item.type == "folder") {
           folders.push(item.name);
@@ -445,7 +454,7 @@ module.exports = {
         if (isAlreadyPresent == undefined) {
           this.config.non_macros_list.push({ file_name: file.name });
         }
-        SvelteComponents.showDialog("Upload", {
+        await SvelteComponents.showDialog("Upload", {
           file,
           onComplete: () => {
             this.last_file_time = undefined; // Force reload
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 5dab058..a4f3cff 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -328,15 +328,16 @@ script#control-view-template(type="text/x-template")
                 .fa.fa-trash
                 |  Selected
 
-          select(title="Select previously uploaded GCode programs.",
-            v-model="state.folder", :disabled="!is_ready",
-            style="max-width:100%")
-            option(v-for="file in gcode_folders", :value="file") {{file}}
+          .drop-down-container
+            select(title="Select previously uploaded GCode folder.",
+              v-model="state.folder", :disabled="!is_ready",
+              style="max-width:100%")
+              option(v-for="file in gcode_folders", :value="file") {{file}}
 
-          select(title="Select previously uploaded GCode programs.",
-            v-model="state.selected", @change="load", :disabled="!is_ready",
-            style="max-width:100%")
-            option(v-for="file in gcode_files", :value="file") {{file}}
+            select(title="Select previously uploaded GCode programs.",
+              v-model="state.selected", @change="load", :disabled="!is_ready",
+              style="max-width:100%")
+              option(v-for="file in gcode_files", :value="file") {{file}}
 
           .progress(v-if="toolpath_progress && toolpath_progress < 1",
             title="Simulating GCode to check for errors, calculate ETA and " +
diff --git a/src/stylus/style.styl b/src/stylus/style.styl
index 8200dbf..fd48587 100644
--- a/src/stylus/style.styl
+++ b/src/stylus/style.styl
@@ -289,6 +289,9 @@ span.unit
 .control-view
   max-width 95%
 
+  .drop-down-container
+    margin 1rem
+
   table
     border-collapse collapse