diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index fd679ac255f..ebe90c734e5 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-30 Mikhail Khodjaiants
+	Fix for bug 50967:  Linux/SWT blows when double click on the register view. 
+	* ChangeRegisterValueAction.java
+
 2004-01-29 Mikhail Khodjaiants
 	Added new error status handler.
 	* plugin.xml
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java
index b61be612ded..1b6b353f5b6 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java
@@ -206,7 +206,9 @@ public class ChangeRegisterValueAction extends SelectionProviderAction
 		}
 		catch( DebugException de )
 		{
+			cleanup();
 			CDebugUIPlugin.errorDialog( "Setting the register value failed.", de );
+			return;
 		}
 		cleanup();
 	}