diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml
index 8e0cfcb2..ce9172a5 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml
@@ -283,7 +283,7 @@
   <Instance name="RecentFileItemTemplateResource">
     <Instance ref.CodeBehind="false" ref.Class="demo::RecentFileItemTemplate">
       <ref.Parameter Name="ViewModel" Class="presentation::controls::GuiToolstripCommand"/>
-      <ControlTemplate>
+      <ControlTemplate MinSizeLimitation="LimitToElementAndChildren">
         <MenuItemButton Command-ref="ViewModel">
           <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
         </MenuItemButton>
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
index 71bf38d0..9c91e5ec 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
@@ -2513,6 +2513,9 @@ Class (::demo::RecentFileItemTemplateConstructor)
 	{
 		(this->__vwsn_precompile_0 = __vwsn_this_);
 		(this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel());
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
+		}
 		{
 			(this->__vwsn_precompile_1 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton));
 		}
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
index 63f619dd..a54b0669 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
@@ -70,7 +70,6 @@ namespace demo
 			textBox->SetText(reader.ReadToEnd());
 			textBox->Select(TextPos(), TextPos());
 			textBox->SetFocus();
-			textBox->ClearUndoRedo();
 
 			fileName = dialogOpen->GetFileName();
 			if (INVLOC.EndsWith(fileName, L".xml", Locale::IgnoreCase))
@@ -81,6 +80,8 @@ namespace demo
 			{
 				SetupTextConfig();
 			}
+
+			textBox->ClearUndoRedo();
 			AddRecentFile(path);
 			return true;
 		}