diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index 011e16d3f8..b7ac7f7b36 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -44,11 +44,11 @@ if [ "$SAFEMODE" != "yes" ]
 then
 	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
 	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/system/lib"
-	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/system/add-ons"
+	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/common/add-ons:/boot/system/add-ons"
 else
 	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
 	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/system/lib"
-	export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
+	export ADDON_PATH="%A/add-ons:/boot/common/add-ons:/boot/system/add-ons"
 fi
 
 # media kit