diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index f54c175604b..aafa125fef3 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-26 Mikhail Khodjaiants
+	Bug 122010: Registers View is displayed even if supportsRegisters and 
+	supportsRegisterModification are disabled.
+	Fix for supportsRegisterModification.
+	* CRegister.java
+
 2006-05-19 Mikhail Khodjaiants
 	Warning cleanup.
 	* CBreakpointManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
index 5cfb50f07ef..d0525cccd1c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
@@ -292,7 +292,7 @@ public class CRegister extends CVariable implements IRegister {
 
 		public boolean isEditable() throws DebugException {
 			ICDIRegister reg = getCDIRegister();
-			if ( reg != null ) {
+			if ( reg != null && reg.getTarget().getConfiguration().supportsRegisterModification() ) {
 				try {
 					return reg.isEditable();
 				}