diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index 9497de4a1e..452fb7e90d 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -72,8 +72,10 @@ class CommandAddonManager:
     def Activated(self):
 
         # display first use dialog if needed
-        readWarning = FreeCAD.ParamGet("User parameter:Plugins/addonsRepository").GetBool("readWarning",
-                                                                                          False)
+        readWarningParameter = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Addons")
+        readWarning = readWarningParameter.GetBool("readWarning", False)
+        newReadWarningParameter = FreeCAD.ParamGet("User parameter:Plugins/addonsRepository")
+        readWarning |= newReadWarningParameter.GetBool("readWarning", False)
         if not readWarning:
             if (QtGui.QMessageBox.warning(None,
                                           "FreeCAD",
@@ -85,8 +87,7 @@ class CommandAddonManager:
                                           QtGui.QMessageBox.Cancel |
                                           QtGui.QMessageBox.Ok) !=
                     QtGui.QMessageBox.StandardButton.Cancel):
-                FreeCAD.ParamGet("User parameter:Plugins/addonsRepository").SetBool("readWarning",
-                                                                                    True)
+                readWarningParameter.SetBool("readWarning", True)
                 readWarning = True
 
         if readWarning: