diff --git a/source/gui/addonStoreGui/controls/messageDialogs.py b/source/gui/addonStoreGui/controls/messageDialogs.py
index 17b5a0a55be..dab72f1ec68 100644
--- a/source/gui/addonStoreGui/controls/messageDialogs.py
+++ b/source/gui/addonStoreGui/controls/messageDialogs.py
@@ -473,6 +473,9 @@ def onOpenStoreButton(self, evt: wx.CommandEvent):
 	def onUpdateAllButton(self, evt: wx.CommandEvent):
 		from gui.addonStoreGui.viewModels.store import AddonStoreVM
 
+		self.updateAllButton.Disable()
+		self.openStoreButton.Disable()
+
 		self.listItemVMs: list[AddonListItemVM] = []
 		for addon in self.addonsPendingUpdate:
 			listItemVM = AddonListItemVM(addon, status=AvailableAddonStatus.UPDATE)
@@ -482,8 +485,6 @@ def onUpdateAllButton(self, evt: wx.CommandEvent):
 		self.addonsList.Refresh()
 		# Translators: Message shown when updating add-ons in the updatable add-ons dialog
 		ui.message(pgettext("addonStore", "Updating add-ons..."))
-		self.updateAllButton.Disable()
-		self.openStoreButton.Disable()
 		self.addonsList.SetFocus()
 		self.addonsList.Focus(0)