diff --git a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
index 13157bb02..e09032c3c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
@@ -23,13 +23,15 @@ import android.os.Build.VERSION.SDK_INT
  */
 object PrivateShortcutCreateManager {
 
-    fun doesPrivateBrowsingPinnedShortcutExist(context: Context) : Boolean {
+    fun doesPrivateBrowsingPinnedShortcutExist(context: Context): Boolean {
         return if (SDK_INT >= Build.VERSION_CODES.N_MR1) {
             val pinnedShortcuts = context.getSystemService(ShortcutManager::class.java).pinnedShortcuts
-            for (s in pinnedShortcuts) {
-                if (s.intent?.extras?.getString(HomeActivity.OPEN_TO_SEARCH) ==
-                    StartSearchIntentProcessor.PRIVATE_BROWSING_PINNED_SHORTCUT) {
-                    return true
+            if (pinnedShortcuts.any()) {
+                for (s in pinnedShortcuts) {
+                    if (s.intent?.extras?.getString(HomeActivity.OPEN_TO_SEARCH) ==
+                        StartSearchIntentProcessor.PRIVATE_BROWSING_PINNED_SHORTCUT) {
+                        return true
+                    }
                 }
             }
             false
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index f1bc60661..a32bee99f 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -349,7 +349,8 @@ class HomeFragment : Fragment() {
         }, owner = this)
 
         if (context.settings().showPrivateModeContextualFeatureRecommender &&
-            browsingModeManager.mode.isPrivate && !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(requireContext())) {
+            browsingModeManager.mode.isPrivate &&
+            !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(context)) {
             recommendPrivateBrowsingShortcut()
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index c51ccdf64..85b7308bb 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -133,7 +133,7 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
         }
 
         findPreference<Preference>(getPreferenceKey(R.string.pref_key_add_private_browsing_shortcut))?.apply {
-            isVisible = !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(requireContext())
+            isVisible = !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(context)
         }
 
         setupPreferences()