Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs
===================================================================
diff -u -rbe44437457c686ba645b3b49e9c795a6cbed16ef -r1ded114c4ba64e830cab6b76924c1f81d996b8c3
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision be44437457c686ba645b3b49e9c795a6cbed16ef)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision 1ded114c4ba64e830cab6b76924c1f81d996b8c3)
@@ -350,11 +350,18 @@
         /// Sets the data source on the <see cref="DataGridView"/>.
         /// </summary>
         /// <param name="dataSource">The data source to set.</param>
-        /// <remarks>Providing a value of <c>null</c> for <paramref name="dataSource"/>
-        /// will clear the grid view.</remarks>
+        /// <remarks>
+        /// <list type="bullet">
+        /// <item>Providing a value of <c>null</c> for <paramref name="dataSource"/>
+        /// will clear the grid view.</item>
+        /// <item>To reset the scrollbars to the starting position,
+        /// the scrollbars need to be set to none before changing the datasource.</item>
+        /// </list></remarks>
         public void SetDataSource(IEnumerable dataSource)
         {
+            dataGridView.ScrollBars = ScrollBars.None;
             dataGridView.DataSource = dataSource;
+            dataGridView.ScrollBars = ScrollBars.Both;
         }
 
         /// <summary>