diff --git a/OS.lua b/OS.lua
index 9582b913..e1b96502 100755
--- a/OS.lua
+++ b/OS.lua
@@ -342,9 +342,6 @@ local function createOSWidgets()
 			else
 				icon.onLeftClick(icon, e1, e2, e3, e4, e5, e6, ...)
 			end
-
-			icon.selected = false
-			MineOSInterface.mainContainer:drawOnScreen()
 		end
 	end
 
@@ -371,6 +368,11 @@ local function createOSWidgets()
 			local indexOf = icon:indexOf()
 			local menu = MineOSInterface.addContextMenu(MineOSInterface.mainContainer, e3, e4)
 			
+			menu.onMenuClosed = function()
+				icon.selected = false
+				MineOSInterface.mainContainer:drawOnScreen()
+			end
+
 			if icon.windows then
 				local eventData = {...}
 				menu:addItem(MineOSCore.localization.newWindow).onTouch = function()
@@ -447,6 +449,11 @@ local function createOSWidgets()
 	icon.onRightClick = function(icon, e1, e2, e3, e4)
 		local menu = MineOSInterface.addContextMenu(MineOSInterface.mainContainer, e3, e4)
 		
+		menu.onMenuClosed = function()
+			icon.selected = false
+			MineOSInterface.mainContainer:drawOnScreen()
+		end
+		
 		menu:addItem(MineOSCore.localization.emptyTrash).onTouch = function()
 			local container = MineOSInterface.addBackgroundContainer(MineOSInterface.mainContainer, MineOSCore.localization.areYouSure)
 
diff --git a/lib/MineOSInterface.lua b/lib/MineOSInterface.lua
index 6efe5894..35ca4143 100755
--- a/lib/MineOSInterface.lua
+++ b/lib/MineOSInterface.lua
@@ -708,7 +708,7 @@ function MineOSInterface.iconRightClick(icon, e1, e2, e3, e4)
 
 	local menu = MineOSInterface.addContextMenu(MineOSInterface.mainContainer, e3, e4)
 	
-	menu.onClose = function()
+	menu.onMenuClosed = function()
 		icon.parent.parent:deselectAll()
 		MineOSInterface.mainContainer:drawOnScreen()
 	end