diff --git a/src/js/control-view.js b/src/js/control-view.js
index e4ecbc2..05b99ed 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -642,7 +642,7 @@ module.exports = {
         item => !this.selected_items_to_delete.includes(item.file_name),
       );
       const folder_to_update = this.config.gcode_list.find(
-        item => item.name == this.state.folder && item.type == "folder",
+        item => item.name == this.config.gcode_list[this.selected_folder_index].name && item.type == "folder",
       );
       folder_to_update.files = folder_to_update.files.filter(
         item => !this.selected_items_to_delete.includes(item.file_name),
@@ -655,6 +655,7 @@ module.exports = {
 
       this.save_config(this.config);
       this.filtered_files = [];
+      this.search_query = "";
       this.selected_folder_index = null;
       this.selected_items_to_delete = [];
       this.deleteGCode = false;
@@ -662,6 +663,7 @@ module.exports = {
 
     cancel_delete: function () {
       this.filtered_files = [];
+      this.search_query = "";
       this.selected_folder_index = null;
       this.selected_items_to_delete = [];
       this.deleteGCode = false;
diff --git a/src/stylus/style.styl b/src/stylus/style.styl
index 7dafbcc..6d03e76 100644
--- a/src/stylus/style.styl
+++ b/src/stylus/style.styl
@@ -314,6 +314,9 @@ span.unit
     margin-bottom 10px
     width 50%
 
+  .file-item
+    padding 3px
+    
   .folder-item
     padding 10px