diff --git a/Import/GacUI.cpp b/Import/GacUI.cpp
index 4d95e9de..d3dadbcf 100644
--- a/Import/GacUI.cpp
+++ b/Import/GacUI.cpp
@@ -2295,13 +2295,26 @@ GuiScrollView
 			void GuiScrollView::CalculateView()
 			{
 				auto ct = TypedControlTemplateObject(true);
+				auto hScroll = ct->GetHorizontalScroll();
+				auto vScroll = ct->GetVerticalScroll();
+
 				if (!supressScrolling)
 				{
 					Size fullSize = QueryFullSize();
 					while (true)
 					{
-						bool flagA = AdjustView(fullSize);
-						bool flagB = AdjustView(fullSize);
+						bool flagA = false;
+						bool flagB = false;
+
+						flagA = AdjustView(fullSize);
+						bool bothInvisible = (hScroll ? !hScroll->GetVisible() : true) && (vScroll ? !vScroll->GetVisible() : true);
+
+						if (!bothInvisible)
+						{
+							flagB = AdjustView(fullSize);
+							bothInvisible = (hScroll ? !hScroll->GetVisible() : true) && (vScroll ? !vScroll->GetVisible() : true);
+						}
+
 						supressScrolling = true;
 						CallUpdateView();
 						supressScrolling = false;
@@ -2311,18 +2324,18 @@ GuiScrollView
 						{
 							vint smallMove = GetSmallMove();
 							Size bigMove = GetBigMove();
-							if (auto scroll = ct->GetHorizontalScroll())
+							if (hScroll)
 							{
-								scroll->SetSmallMove(smallMove);
-								scroll->SetBigMove(bigMove.x);
+								hScroll->SetSmallMove(smallMove);
+								hScroll->SetBigMove(bigMove.x);
 							}
-							if (auto scroll = ct->GetVerticalScroll())
+							if (vScroll)
 							{
-								scroll->SetSmallMove(smallMove);
-								scroll->SetBigMove(bigMove.y);
+								vScroll->SetSmallMove(smallMove);
+								vScroll->SetBigMove(bigMove.y);
 							}
 
-							if (!flagA && !flagB)
+							if (bothInvisible || !flagA && !flagB)
 							{
 								break;
 							}
diff --git a/SampleForDoc/GacUI/UIRes/32bits/control_ribbon_gallery.bin b/SampleForDoc/GacUI/UIRes/32bits/control_ribbon_gallery.bin
index da9ad496..3e7526d2 100644
Binary files a/SampleForDoc/GacUI/UIRes/32bits/control_ribbon_gallery.bin and b/SampleForDoc/GacUI/UIRes/32bits/control_ribbon_gallery.bin differ
diff --git a/SampleForDoc/GacUI/UIRes/64bits/control_ribbon_gallery.bin b/SampleForDoc/GacUI/UIRes/64bits/control_ribbon_gallery.bin
index d8c936c7..4507ddc4 100644
Binary files a/SampleForDoc/GacUI/UIRes/64bits/control_ribbon_gallery.bin and b/SampleForDoc/GacUI/UIRes/64bits/control_ribbon_gallery.bin differ
diff --git a/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml b/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml
index 254af6e0..06c7c2f2 100644
--- a/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml
+++ b/SampleForDoc/GacUI/XmlRes/control_ribbon_gallery/Resource.xml
@@ -90,6 +90,16 @@
           }
 
           var colorGroups : observe ColorGroup^[] = CreateGroups();
+
+          func PrintLog(name:string, index: int): void
+          {
+            var pos = colorList.IndexToGalleryPos(index);
+            var item = self.colorGroups[pos.group].Items[pos.item];
+            var log = $"$(name): $(item.IconColor)\r\n";
+            textLog.Select({row:textLog.RowCount column:0}, {row:textLog.RowCount column:0});
+            textLog.SelectionText = log;
+            textLog.Select({row:textLog.RowCount column:0}, {row:textLog.RowCount column:0});
+          }
         ]]></ref.Members>
         <Window ref.Name="self" Text="control_ribbon_gallery" ClientSize="x:640 y:480">
           <MessageDialog ref.Name="dialogMessage" Title="You Expanded a Group!" Text="GuiRibbonGroup::ExpandButtonClicked is executed!"/>
@@ -101,8 +111,9 @@
           <ToolstripCommand ref.Name="commandPaste" Image-uri="res://ToolbarImages/Paste" Text="Paste"/>
           <ToolstripCommand ref.Name="commandDelete" Image-uri="res://ToolbarImages/Delete" Text="Delete"/>
 
-          <Table AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
+          <Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="5" BorderVisible="false" MinSizeLimitation="LimitToElementAndChildren">
             <att.Rows>
+              <CellOption>composeType:MinSize</CellOption>
               <CellOption>composeType:MinSize</CellOption>
               <CellOption>composeType:Percentage percentage:1.0</CellOption>
             </att.Rows>
@@ -119,7 +130,7 @@
                     <att.Groups>
                       <RibbonGroup Text="Something" LargeImage-uri="res://ToolbarImages/PasteLarge">
                         <att.Items>
-                          <BindableRibbonGalleryList MinCount="2" MaxCount="5" VisibleItemCount="5" ItemTemplate="sample::ColorItemTemplate" env.ItemType="sample::ColorGroup^">
+                          <BindableRibbonGalleryList ref.Name="colorList" MinCount="2" MaxCount="5" VisibleItemCount="5" ItemTemplate="sample::ColorItemTemplate" env.ItemType="sample::ColorGroup^">
                             <att.ItemSource-bind>self.colorGroups</att.ItemSource-bind>
                             <att.GroupTitleProperty>Name</att.GroupTitleProperty>
                             <att.GroupChildrenProperty>Items</att.GroupChildrenProperty>
@@ -142,6 +153,22 @@
                                 </ToolstripGroup>
                               </ToolstripGroupContainer>
                             </att.SubMenu-set>
+
+                            <ev.PreviewStarted-eval><![CDATA[
+                              {
+                                self.PrintLog("PreviewStarted", arguments.itemIndex);
+                              }
+                            ]]></ev.PreviewStarted-eval>
+                            <ev.PreviewStopped-eval><![CDATA[
+                              {
+                                self.PrintLog("PreviewStopped", arguments.itemIndex);
+                              }
+                            ]]></ev.PreviewStopped-eval>
+                            <ev.ItemApplied-eval><![CDATA[
+                              {
+                                self.PrintLog("ItemApplied", arguments.itemIndex);
+                              }
+                            ]]></ev.ItemApplied-eval>
                           </BindableRibbonGalleryList>
                         </att.Items>
                       </RibbonGroup>
@@ -150,6 +177,16 @@
                 </att.Pages>
               </RibbonTab>
             </Cell>
+
+            <Cell Site="row:1 column:0">
+              <Label Text="Event Logs:"/>
+            </Cell>
+
+            <Cell Site="row:2 column:0">
+              <MultilineTextBox ref.Name="textLog" Readonly="true" HorizontalAlwaysVisible="false" VerticalAlwaysVisible="true">
+                <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+              </MultilineTextBox>
+            </Cell>
           </Table>
         </Window>
       </Instance>