diff --git a/Perspex.Controls/ScrollViewer.cs b/Perspex.Controls/ScrollViewer.cs
index 59e0022515..d9f63a0a71 100644
--- a/Perspex.Controls/ScrollViewer.cs
+++ b/Perspex.Controls/ScrollViewer.cs
@@ -10,7 +10,6 @@ namespace Perspex.Controls
     using System.Reactive.Linq;
     using Perspex.Controls.Presenters;
     using Perspex.Controls.Primitives;
-    using Perspex.Threading;
 
     public class ScrollViewer : ContentControl
     {
@@ -63,8 +62,7 @@ namespace Perspex.Controls
             var extentAndViewport = Observable.CombineLatest(
                 this.GetObservable(ExtentProperty),
                 this.GetObservable(ViewportProperty))
-                .Select(x => new { Extent = x[0], Viewport = x[1] })
-                .Throttle(TimeSpan.FromMilliseconds(100), PerspexScheduler.Instance);
+                .Select(x => new { Extent = x[0], Viewport = x[1] });
 
             this.Bind(
                 VerticalScrollBarViewportSizeProperty,
diff --git a/Perspex.Diagnostics/DevTools.cs b/Perspex.Diagnostics/DevTools.cs
index 8f80c8a30d..da0c4bd3be 100644
--- a/Perspex.Diagnostics/DevTools.cs
+++ b/Perspex.Diagnostics/DevTools.cs
@@ -118,8 +118,10 @@ namespace Perspex.Diagnostics
             {
                 Window window = new Window
                 {
-                    Width = 1024,
-                    Height = 512,
+                    // HACK: Set width and height here as a quick fix as there's a problem with 
+                    // the dev tools window hanging when it's set to auto-size.
+                    Width = 800,
+                    Height = 600,
                     Content = new DevTools
                     {
                         Root = (Window)sender,