diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 0d9a5f072bc..d864f0ce5c2 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -1823,7 +1823,7 @@ public class CDebugTarget extends CDebugElement
 	 */
 	public void setCurrentThread( IThread thread ) throws DebugException
 	{
-		if ( !isAvailable() || thread == null || !(thread instanceof CThread) )
+		if ( !isSuspended() || !isAvailable() || thread == null || !(thread instanceof CThread) )
 		{
 			return;
 		}