diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
index 663352b12de..8b25597dd53 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
@@ -342,10 +342,12 @@ public class CDebugUIPlugin extends AbstractUIPlugin implements ISelectionListen
 					{
 						try
 						{
-							if ( !sameThread( (IDebugElement)element ) )
-							{
-								((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
-							}
+							((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
+							// The sameThread() method is doing the wrong calculations, let the implementation handle it.
+							//if ( !sameThread( (IDebugElement)element ) )
+							//{
+							//	((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
+							//}
 						}
 						catch( DebugException e )
 						{