diff --git a/NotePad/MainWindow.axaml b/NotePad/MainWindow.axaml
index ed27181..ad84b52 100644
--- a/NotePad/MainWindow.axaml
+++ b/NotePad/MainWindow.axaml
@@ -29,7 +29,7 @@
             <MenuItem Header="F_ormat">
                 <MenuItem Header="_Word Wrap" x:Name="WordWrapMenuItem" Click="OnWordWrapToggle">
                     <MenuItem.Icon>
-                        <CheckBox x:Name="WordWrapCheckBox" IsChecked="True" IsHitTestVisible="False"/>
+                        <CheckBox x:Name="WordWrapCheckBox" IsChecked="False" IsHitTestVisible="False"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
@@ -43,7 +43,7 @@
             <TextBox x:Name="EditorTextBox"
                      AcceptsReturn="True"
                      AcceptsTab="True"
-                     TextWrapping="Wrap"
+                     TextWrapping="NoWrap"
                      VerticalAlignment="Stretch"
                      HorizontalAlignment="Stretch"
                      ScrollViewer.VerticalScrollBarVisibility="Auto"
diff --git a/NotePad/MainWindow.axaml.cs b/NotePad/MainWindow.axaml.cs
index 6500854..4cf406a 100644
--- a/NotePad/MainWindow.axaml.cs
+++ b/NotePad/MainWindow.axaml.cs
@@ -294,7 +294,17 @@ namespace NotePad
             var textBox = this.FindControl<TextBox>("EditorTextBox")!;
 
             checkBox.IsChecked = !checkBox.IsChecked;
-            textBox.TextWrapping = checkBox.IsChecked == true ? TextWrapping.Wrap : TextWrapping.NoWrap;
+
+            if (checkBox.IsChecked == true)
+            {
+                textBox.TextWrapping = TextWrapping.Wrap;
+                ScrollViewer.SetHorizontalScrollBarVisibility(textBox, Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled);
+            }
+            else
+            {
+                textBox.TextWrapping = TextWrapping.NoWrap;
+                ScrollViewer.SetHorizontalScrollBarVisibility(textBox, Avalonia.Controls.Primitives.ScrollBarVisibility.Auto);
+            }
         }
 
         // Edit Menu