diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
index 8803dc4b5..a638569ea 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
@@ -71,29 +71,29 @@ private void OnBitLengthButtonPressed(object parameter)
             WordButton.Visibility = Visibility.Collapsed;
             ByteButton.Visibility = Visibility.Collapsed;
             if (buttonId == "0")
+            {
+                Model.ValueBitLength = BitLength.BitLengthQWord;
+                QwordButton.Visibility = Visibility.Visible;
+                QwordButton.Focus(FocusState.Programmatic);
+            }
+            else if (buttonId == "1")
             {
                 Model.ValueBitLength = BitLength.BitLengthDWord;
                 DwordButton.Visibility = Visibility.Visible;
                 DwordButton.Focus(FocusState.Programmatic);
             }
-            else if (buttonId == "1")
+            else if (buttonId == "2")
             {
                 Model.ValueBitLength = BitLength.BitLengthWord;
                 WordButton.Visibility = Visibility.Visible;
                 WordButton.Focus(FocusState.Programmatic);
             }
-            else if (buttonId == "2")
+            else if (buttonId == "3")
             {
                 Model.ValueBitLength = BitLength.BitLengthByte;
                 ByteButton.Visibility = Visibility.Visible;
                 ByteButton.Focus(FocusState.Programmatic);
             }
-            else if (buttonId == "3")
-            {
-                Model.ValueBitLength = BitLength.BitLengthQWord;
-                QwordButton.Visibility = Visibility.Visible;
-                QwordButton.Focus(FocusState.Programmatic);
-            }
         }
 
         private bool m_isErrorVisualState;
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs
index 464c9ce89..c858db75f 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs
@@ -65,23 +65,23 @@ private void OnAngleButtonPressed(object commandParameter)
             GradsButton.Visibility = Visibility.Collapsed;
 
             if (buttonId == "0")
+            {
+                Model.SwitchAngleType(NumbersAndOperatorsEnum.Degree);
+                DegreeButton.Visibility = Visibility.Visible;
+                DegreeButton.Focus(FocusState.Programmatic);
+            }
+            else if (buttonId == "1")
             {
                 Model.SwitchAngleType(NumbersAndOperatorsEnum.Radians);
                 RadianButton.Visibility = Visibility.Visible;
                 RadianButton.Focus(FocusState.Programmatic);
             }
-            else if (buttonId == "1")
+            else if (buttonId == "2")
             {
                 Model.SwitchAngleType(NumbersAndOperatorsEnum.Grads);
                 GradsButton.Visibility = Visibility.Visible;
                 GradsButton.Focus(FocusState.Programmatic);
             }
-            else if (buttonId == "2")
-            {
-                Model.SwitchAngleType(NumbersAndOperatorsEnum.Degree);
-                DegreeButton.Visibility = Visibility.Visible;
-                DegreeButton.Focus(FocusState.Programmatic);
-            }
         }
 
         private void FToEButton_Toggled(object sender, RoutedEventArgs e)