diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index c72f3181f..c86652c8b 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.Navigation
@@ -87,11 +88,16 @@ class AddonsManagementFragment : Fragment(), AddonsManagerAdapterDelegate {
                         this@AddonsManagementFragment,
                         addons
                     )
+                    view.add_ons_progress_bar.isVisible = false
+                    view.add_ons_empty_message.isVisible = false
+
                     recyclerView.adapter = adapter
                 }
             } catch (e: AddonManagerException) {
                 lifecycleScope.launch(Dispatchers.Main) {
                     showSnackBar(view, getString(R.string.mozac_feature_addons_failed_to_query_add_ons))
+                    view.add_ons_progress_bar.isVisible = false
+                    view.add_ons_empty_message.isVisible = true
                 }
             }
         }
diff --git a/app/src/main/res/layout/fragment_add_ons_management.xml b/app/src/main/res/layout/fragment_add_ons_management.xml
index a7cd5a6b1..a10bd1110 100644
--- a/app/src/main/res/layout/fragment_add_ons_management.xml
+++ b/app/src/main/res/layout/fragment_add_ons_management.xml
@@ -21,4 +21,23 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:visibility="gone" />
+
+    <ProgressBar
+        android:id="@+id/add_ons_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <TextView
+        android:id="@+id/add_ons_empty_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/no_add_ons"
+        android:textColor="?secondaryText"
+        android:textSize="16sp"
+        android:visibility="gone"/>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7278d398..fe2ea01c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,6 +66,8 @@
     <string name="browser_menu_edit_bookmark">Edit bookmark</string>
     <!-- Browser menu button that sends a user to help articles -->
     <string name="browser_menu_addon_manager">Add-ons Manager</string>
+    <!-- Text displayed when there are no add-ons to be shown -->
+    <string name="no_add_ons">No add-ons here</string>
     <!-- Browser menu button that sends a user to help articles -->
     <string name="browser_menu_help">Help</string>
     <!-- Browser menu button that sends a to a the what's new article -->