diff --git a/trunk/ProcessHacker/Components/HandleList.cs b/trunk/ProcessHacker/Components/HandleList.cs
index bb80065d9..8f733717e 100644
--- a/trunk/ProcessHacker/Components/HandleList.cs
+++ b/trunk/ProcessHacker/Components/HandleList.cs
@@ -322,9 +322,9 @@ namespace ProcessHacker.Components
         public static bool HasHandleProperties(string type)
         {
             if (type == "Token" || type == "Process" || type == "File" || 
+                type == "Job" || 
                 type == "Event" || type == "Mutant" || type == "Section" || 
-                type == "Semaphore" || 
-                type == "DLL" || type == "Mapped File")
+                type == "Semaphore")
                 return true;
             else
                 return false;
diff --git a/trunk/ProcessHacker/Forms/HandleFilterWindow.cs b/trunk/ProcessHacker/Forms/HandleFilterWindow.cs
index 27118cbab..9b9cde16f 100644
--- a/trunk/ProcessHacker/Forms/HandleFilterWindow.cs
+++ b/trunk/ProcessHacker/Forms/HandleFilterWindow.cs
@@ -234,6 +234,11 @@ namespace ProcessHacker
 
         private void propertiesMenuItem_Click(object sender, EventArgs e)
         {
+            string type = listHandles.SelectedItems[0].SubItems[1].Text;
+
+            if (!HandleList.HasHandleProperties(type))
+                return;
+
             try
             {
                 HandleList.ShowHandleProperties(