Index: src/chext/TShellExtData.cpp
===================================================================
diff -u -N -r8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8 -r0485fd134d85ed64ac3550769833b21833ef8ff6
--- src/chext/TShellExtData.cpp	(.../TShellExtData.cpp)	(revision 8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8)
+++ src/chext/TShellExtData.cpp	(.../TShellExtData.cpp)	(revision 0485fd134d85ed64ac3550769833b21833ef8ff6)
@@ -215,8 +215,20 @@
 
 	// check if there was a state defined by reading the current context menu
 	if(m_eDefaultSystemMenuAction != eAction_None)
-		return m_eDefaultSystemMenuAction == spMenuItem->GetDefaultItemHint();
+	{
+		switch(m_eDefaultSystemMenuAction)
+		{
+		case eAction_Copy:
+			return spMenuItem->GetDefaultItemHint() == chcore::eOperation_Copy;
 
+		case eAction_Move:
+			return spMenuItem->GetDefaultItemHint() == chcore::eOperation_Move;
+
+		default:
+			return false;
+		}
+	}
+
 	// check if there is preferred drop effect associated with the source path
 	switch(spMenuItem->GetSourcePathsInfo().GetSrcPathsSource())
 	{