diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py
index 6ff3d46c66..70cc329998 100644
--- a/frappe/desk/doctype/desktop_icon/desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py
@@ -69,6 +69,10 @@ def get_desktop_icons(user=None):
 				# flag for modules_setup page
 				standard_icon.hidden_in_standard = standard_icon.hidden
 
+				# if blocked, hidden too!
+				if standard_icon.blocked:
+					standard_icon.hidden = 1
+
 				user_icons.append(standard_icon)
 
 		user_blocked_modules = frappe.get_doc('User', user).get_blocked_modules()
@@ -171,9 +175,9 @@ def set_hidden(module_name, user=None, hidden=1):
 		if hidden and icon.custom:
 			frappe.delete_doc(icon.doctype, icon.name, ignore_permissions=True)
 			return
-		else:
-			# hidden by user
-			icon.db_set('hidden', hidden)
+
+		# hidden by user
+		icon.db_set('hidden', hidden)
 	else:
 		icon = frappe.get_doc('Desktop Icon', {'standard': 1, 'module_name': module_name})
 
diff --git a/frappe/desk/doctype/desktop_icon/test_desktop_icon.py b/frappe/desk/doctype/desktop_icon/test_desktop_icon.py
index 9ee3c20b44..b0eed0bdaa 100644
--- a/frappe/desk/doctype/desktop_icon/test_desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/test_desktop_icon.py
@@ -16,7 +16,7 @@ class TestDesktopIcon(unittest.TestCase):
 		frappe.set_user('test@example.com')
 		frappe.db.sql('delete from `tabDesktop Icon` where standard=0')
 		frappe.db.sql('delete from `tabBlock Module`')
-		frappe.db.sql('update `tabDesktop Icon` set hidden=0')
+		frappe.db.sql('update `tabDesktop Icon` set hidden=0, blocked=0')
 
 	def tearDown(self):
 		frappe.set_user('Administrator')