diff --git a/Applications/Finder.app/Main.lua b/Applications/Finder.app/Main.lua
index d45cde10..a17fb490 100644
--- a/Applications/Finder.app/Main.lua
+++ b/Applications/Finder.app/Main.lua
@@ -528,7 +528,11 @@ local function updateIconField()
 				saveConfig()
 				updateSidebar()
 				workspace:draw()
-			end	
+			end
+		else
+			if not config.gridMode then
+				GUI.tableEventHandler(workspace, self, e1, e2, e3, e4, e5, ...)
+			end
 		end
 	end
 
diff --git a/Libraries/GUI.lua b/Libraries/GUI.lua
index b5b366c2..fbfd2306 100755
--- a/Libraries/GUI.lua
+++ b/Libraries/GUI.lua
@@ -5078,6 +5078,7 @@ function GUI.table(
 		itemSelectionForeground = itemSelectionForeground
 	}
 
+	table.blockScreenEvents = true
 	table.itemHeight = itemHeight
 	table.selectedRows = {}