diff --git a/src/Perspex.Controls/TextBox.cs b/src/Perspex.Controls/TextBox.cs
index 583322f1b0..2e1bfc1cac 100644
--- a/src/Perspex.Controls/TextBox.cs
+++ b/src/Perspex.Controls/TextBox.cs
@@ -79,8 +79,8 @@ namespace Perspex.Controls
 
         public TextBox()
         {
-            var canScrollHorizontally = this.GetObservable(AcceptsReturnProperty)
-                .Select(x => !x);
+            var canScrollHorizontally = this.GetObservable(TextWrappingProperty)
+                .Select(x => x == TextWrapping.NoWrap);
 
             Bind(
                 ScrollViewer.CanScrollHorizontallyProperty,