diff --git a/lcl/forms.pp b/lcl/forms.pp
index c74c8362ac..d96b0726ec 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -153,6 +153,7 @@ type
     procedure SetVertScrollBar(Value: TControlScrollBar);
     function StoreScrollBars : Boolean;
   protected
+    property AutoScroll: Boolean read FAutoScroll write SetAutoScroll default true;
     procedure AlignControls(AControl: TControl; var ARect: TRect); override;
     procedure CreateWnd; override;
     function  GetClientScrollOffset: TPoint; override;
@@ -172,7 +173,6 @@ type
     procedure UpdateScrollbars;
     function HasVisibleScrollbars: boolean; virtual;
   published
-    property AutoScroll: Boolean read FAutoScroll write SetAutoScroll;
     property HorzScrollBar: TControlScrollBar
               read FHorzScrollBar write SetHorzScrollBar stored StoreScrollBars;
     property VertScrollBar: TControlScrollBar
@@ -189,7 +189,7 @@ type
     property Align;
     property Anchors;
     property AutoSize;
-    //property AutoScroll;
+    property AutoScroll;
     property BorderSpacing;
     property BiDiMode;
     property BorderStyle;
@@ -608,6 +608,7 @@ type
     property ActiveControl;
     property Align;
     property AllowDropFiles;
+    property AutoScroll;
     property AutoSize;
     property BiDiMode;
     property BorderIcons;
diff --git a/lcl/include/scrollingwincontrol.inc b/lcl/include/scrollingwincontrol.inc
index 35426ab635..a71e3df06d 100644
--- a/lcl/include/scrollingwincontrol.inc
+++ b/lcl/include/scrollingwincontrol.inc
@@ -233,6 +233,7 @@ constructor TScrollingWinControl.Create(TheOwner : TComponent);
 begin
   Inherited Create(TheOwner);
 
+  FAutoScroll := true;
   FVertScrollbar := TControlScrollBar.Create(Self, sbVertical);
   FHorzScrollbar := TControlScrollBar.Create(Self, sbHorizontal);