diff --git a/OneMore/UI/MoreAutoCompleteList.cs b/OneMore/UI/MoreAutoCompleteList.cs
index 4b8c3f2fa3..b2ef056016 100644
--- a/OneMore/UI/MoreAutoCompleteList.cs
+++ b/OneMore/UI/MoreAutoCompleteList.cs
@@ -238,6 +238,7 @@ public void SetAutoCompleteList(Control control)
 		/// <param name="recentNames">Optional list of recently used command names</param>
 		public void LoadCommands(IEnumerable<string> names, IEnumerable<string> recentNames = null)
 		{
+			SuspendLayout();
 			Items.Clear();
 			commands.Clear();
 			matches.Clear();
@@ -297,6 +298,9 @@ public void LoadCommands(IEnumerable<string> names, IEnumerable<string> recentNa
 			{
 				Items[0].Selected = true;
 			}
+
+			Invalidate();
+			ResumeLayout();
 		}
 		#endregion public SetAutoCompleteList and LoadCommands