diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 16ecf457c30..a679bb6d101 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-29 Mikhail Khodjaiants
+	Fix for bug 25283.
+	* CDebugTarget.java: in 'setCurrentThread' method set the 'isCurrent' flag to false for the currently current thread.
+
 2002-10-29 Mikhail Khodjaiants
 	Implementing editing features of the memory view.
 	* IFormattedMemoryBlockRow.java
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 3357e394d59..34a3d0d481d 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
@@ -1830,8 +1830,13 @@ public class CDebugTarget extends CDebugElement
 		}
 		try
 		{
-			getCDITarget().setCurrentThread( ((CThread)thread).getCDIThread() );
-			((CThread)thread).setCurrent( true );
+			CThread oldThread = (CThread)getCurrentThread();
+			if ( !oldThread.equals( thread ) )
+			{
+				oldThread.setCurrent( false );
+				getCDITarget().setCurrentThread( ((CThread)thread).getCDIThread() );
+				((CThread)thread).setCurrent( true );
+			}
 		}
 		catch( CDIException e )
 		{