diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs
index 732d714914..c79a78d69e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs
@@ -36,7 +36,7 @@ namespace Debugger
 			}
 		}
 		
-		public bool IsEvaluated {
+		bool IsEvaluated {
 			get {
 				if (Eval != null) {
 					return Eval.Evaluated;
@@ -46,7 +46,7 @@ namespace Debugger
 			}
 		}
 		
-		public Eval Eval {
+		Eval Eval {
 			get {
 				if (cachedEval == null || cachedEval.HasExpired) {
 					cachedEval = evalCreator();
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/VariableCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/VariableCollection.cs
index bdd917577c..6afe4b0eeb 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/VariableCollection.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/VariableCollection.cs
@@ -154,6 +154,9 @@ namespace Debugger
 							((ClassVariable)oldVariable).isPublic = ((ClassVariable)oldVariable).isPublic;
 							((ClassVariable)oldVariable).isStatic = ((ClassVariable)oldVariable).isStatic;
 						}
+						if (newVariable is PropertyVariable) {
+							newVariable.ValueChanged += delegate { oldVariable.OnValueChanged(); };
+						}
 					}
 					// Keep the variable in the list
 					toBeRemoved.Remove(this[newVariable.Name]);