diff --git a/Application/MainWindow/MainWindow.xaml.cs b/Application/MainWindow/MainWindow.xaml.cs
index 5ef1304..5c57187 100644
--- a/Application/MainWindow/MainWindow.xaml.cs
+++ b/Application/MainWindow/MainWindow.xaml.cs
@@ -136,8 +136,6 @@ namespace FeedCenter
 
         private void InitializeDisplay()
         {
-            UpdateToolbarButtonState();
-
             // Get the last category (defaulting to none)
             _currentCategory = _database.Categories.FirstOrDefault(category => category.ID.ToString() == Settings.Default.LastCategoryID);
             DisplayCategory();
@@ -145,6 +143,8 @@ namespace FeedCenter
             // Get the current feed list to match the category
             _feedList = _currentCategory?.Feeds.ToList() ?? _database.Feeds.ToList();
 
+            UpdateToolbarButtonState();
+
             // Clear the link list
             LinkTextList.Items.Clear();