diff --git a/CHANGELIST.md b/CHANGELIST.md
index ed9b5f2c..2b044c34 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -6,6 +6,7 @@
 - Try to handle multi-line fields during parsing
 - Fix CSSKey log handling
 - Show most read-only fields in new tab
+- Add horizontal scroll to user input
 
 ### 2.2 (2021-12-30)
 - Fix Saturn header finding
diff --git a/MPF/UserControls/UserInput.xaml b/MPF/UserControls/UserInput.xaml
index fc966caa..bfbe188a 100644
--- a/MPF/UserControls/UserInput.xaml
+++ b/MPF/UserControls/UserInput.xaml
@@ -24,6 +24,7 @@
                  TextWrapping="{Binding ElementName=userInput, Path=TextWrapping}"
                  IsEnabled="{Binding ElementName=userInput, Path=IsEnabled}"
                  VerticalContentAlignment="{Binding ElementName=userInput, Path=VerticalContentAlignmentValue}"
-                 VerticalScrollBarVisibility="{Binding ElementName=userInput, Path=ScrollBarVisibility}"/>
+                 HorizontalScrollBarVisibility="{Binding ElementName=userInput, Path=HorizontalScrollBarVisibility}"
+                 VerticalScrollBarVisibility="{Binding ElementName=userInput, Path=VerticalScrollBarVisibility}"/>
     </Grid>
 </UserControl>
diff --git a/MPF/UserControls/UserInput.xaml.cs b/MPF/UserControls/UserInput.xaml.cs
index e63081bf..8a3470c5 100644
--- a/MPF/UserControls/UserInput.xaml.cs
+++ b/MPF/UserControls/UserInput.xaml.cs
@@ -34,8 +34,11 @@ namespace MPF.UserControls
         public static readonly DependencyProperty VerticalContentAlignmentValueProperty =
             DependencyProperty.Register("VerticalContentAlignmentValue", typeof(VerticalAlignment), typeof(UserInput));
 
-        public static readonly DependencyProperty ScrollBarVisibilityProperty =
-            DependencyProperty.Register("ScrollBarVisibility", typeof(ScrollBarVisibility), typeof(UserInput));
+        public static readonly DependencyProperty HorizontalScrollBarVisibilityProperty =
+            DependencyProperty.Register("HorizontalScrollBarVisibility", typeof(ScrollBarVisibility), typeof(UserInput));
+
+        public static readonly DependencyProperty VerticalScrollBarVisibilityProperty =
+            DependencyProperty.Register("VerticalScrollBarVisibility", typeof(ScrollBarVisibility), typeof(UserInput));
         
         #endregion
 
@@ -89,10 +92,16 @@ namespace MPF.UserControls
             set => SetValue(VerticalContentAlignmentValueProperty, value);
         }
 
-        public ScrollBarVisibility ScrollBarVisibility
+        public ScrollBarVisibility HorizontalScrollBarVisibility
         {
-            get => (ScrollBarVisibility)GetValue(ScrollBarVisibilityProperty);
-            set => SetValue(ScrollBarVisibilityProperty, value);
+            get => (ScrollBarVisibility)GetValue(HorizontalScrollBarVisibilityProperty);
+            set => SetValue(HorizontalScrollBarVisibilityProperty, value);
+        }
+
+        public ScrollBarVisibility VerticalScrollBarVisibility
+        {
+            get => (ScrollBarVisibility)GetValue(VerticalScrollBarVisibilityProperty);
+            set => SetValue(VerticalScrollBarVisibilityProperty, value);
         }
 
         #endregion
@@ -107,7 +116,8 @@ namespace MPF.UserControls
             TextWrapping = TextWrapping.NoWrap;
             IsEnabledValue = true;
             VerticalContentAlignmentValue = VerticalAlignment.Center;
-            ScrollBarVisibility = ScrollBarVisibility.Auto;
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
 
             InitializeComponent();
         }