diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
index 2cc40a2c3e..4532eff7cf 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml
@@ -8,17 +8,11 @@
 	<StackPanel>
 		<GroupBox Margin="5" Header="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping}">
 			<widgets:StackPanelWithSpacing SpaceBetweenItems="5">
-				<CheckBox x:Name="chbEnableJustMyCode"
-				          Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.EnableJustMyCode}"
-				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.EnableJustMyCode}" />
-				<CheckBox x:Name="chbStepOverNoSymbols"
-				          Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.StepOverNoSymbols}"
-				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.StepOverNoSymbols}" />
+				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.DecompileCodeWithoutSymbols}"
+				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.DecompileCodeWithoutSymbols}" />
 				<CheckBox x:Name="chbStepOverDebuggerAttributes"
 				          Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.StepOverDebuggerAttributes}"
 				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.StepOverDebuggerAttributes}" />
-				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.DecompileCodeWithoutSymbols}"
-				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.DecompileCodeWithoutSymbols}" />
 				<CheckBox x:Name="chbStepOverAllProperties"
 				          Checked="ChbStepOverAllProperties_CheckedChanged"
 				          Unchecked="ChbStepOverAllProperties_CheckedChanged"
diff --git a/src/AddIns/Debugger/Debugger.Core/Options.cs b/src/AddIns/Debugger/Debugger.Core/Options.cs
index 1216cba806..f7f14d2ce0 100644
--- a/src/AddIns/Debugger/Debugger.Core/Options.cs
+++ b/src/AddIns/Debugger/Debugger.Core/Options.cs
@@ -31,6 +31,15 @@ namespace Debugger
 		public string[] SymbolsSearchPaths { get; set; }
 		public bool SuspendOtherThreads { get; set; }
 		public bool PauseOnHandledExceptions { get; set; }
-		public bool DecompileCodeWithoutSymbols { get; set; }
+		bool decompileCodeWithoutSymbols;
+		
+		public bool DecompileCodeWithoutSymbols {
+			get { return decompileCodeWithoutSymbols; }
+			set {
+				decompileCodeWithoutSymbols = value;
+				EnableJustMyCode = !decompileCodeWithoutSymbols;
+				StepOverNoSymbols = !decompileCodeWithoutSymbols;
+			}
+		}
 	}
 }