diff --git a/src/Calculator.Shared/CalcManager/CalculatorList.cs b/src/Calculator.Shared/CalcManager/CalculatorList.cs
index ecbbb09f..00b58e90 100644
--- a/src/Calculator.Shared/CalcManager/CalculatorList.cs
+++ b/src/Calculator.Shared/CalcManager/CalculatorList.cs
@@ -1,10 +1,11 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
 namespace CalculatorApp
 {
-    public class CalculatorList<TType>
+    public class CalculatorList<TType> : IEnumerable<TType>, IEnumerable
     {
         List<TType> m_vector;
 
@@ -128,5 +129,13 @@ namespace CalculatorApp
             suffix = " =";
             return true;
         }
-    }
+
+		/// <inheritdoc />
+		public IEnumerator<TType> GetEnumerator()
+			=> m_vector.GetEnumerator();
+
+		/// <inheritdoc />
+		IEnumerator IEnumerable.GetEnumerator()
+			=> GetEnumerator();
+	}
 }
diff --git a/src/Calculator.Shared/Common/NavCategory.cs b/src/Calculator.Shared/Common/NavCategory.cs
index 50176886..8570ae16 100644
--- a/src/Calculator.Shared/Common/NavCategory.cs
+++ b/src/Calculator.Shared/Common/NavCategory.cs
@@ -561,7 +561,7 @@ namespace CalculatorApp
                         string categoryName = resProvider.GetResourceString(nameResourceKey + "Text");
                         string categoryAutomationName = LocalizationStringUtil.GetLocalizedString(navCategoryItemAutomationNameFormat, categoryName, m_Name);
 
-                        m_Categories.Append( new NavCategory(
+                        m_Categories.Add( new NavCategory(
                             categoryName,
                             categoryAutomationName,
                             (categoryInitializer.Value.glyph),
diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml
index 38507f1e..1e366436 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@@ -142,7 +142,7 @@
 												 DataContext="{x:Bind Model}"
 												 IsSettingsVisible="False"
 												 Loaded="OnNavLoaded"
-												 MenuItemsSource="{x:Bind CreateUIElementsForCategories(Model.Categories), Mode=OneWay}"
+												 MenuItemsSource="{x:Bind UIElementsForCategories, Mode=OneWay}"
 												 OpenPaneLength="{StaticResource SplitViewOpenPaneLength}"
 												 SelectionChanged="OnNavSelectionChanged"
 												 TabIndex="1"
diff --git a/src/Calculator.Shared/Views/MainPage.xaml.cs b/src/Calculator.Shared/Views/MainPage.xaml.cs
index 9977ac9a..c40dbd8d 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml.cs
+++ b/src/Calculator.Shared/Views/MainPage.xaml.cs
@@ -449,9 +449,11 @@ namespace CalculatorApp
             }
         }
 
-        public List<object> CreateUIElementsForCategories(ObservableCollection<NavCategoryGroup> categories)
+		public CalculatorList<object> UIElementsForCategories => CreateUIElementsForCategories(Model.Categories);
+
+		public CalculatorList<object> CreateUIElementsForCategories(ObservableCollection<NavCategoryGroup> categories)
         {
-            var menuCategories = new List<object>();
+            var menuCategories = new CalculatorList<object>();
 
             foreach (var group in categories)
             {