diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 14e4b473a..67352085f 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -127,6 +127,7 @@ import org.mozilla.fenix.theme.DefaultThemeManager
 import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.trackingprotection.TrackingProtectionPanelDialogFragmentDirections
 import org.mozilla.fenix.utils.BrowsersCache
+import org.mozilla.fenix.utils.ManufacturerCodes
 import org.mozilla.fenix.utils.Settings
 import java.lang.ref.WeakReference
 
@@ -617,8 +618,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             Build.VERSION.SDK_INT == Build.VERSION_CODES.N || Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
         // Huawei devices seem to have problems with onKeyLongPress
         // See https://github.com/mozilla-mobile/fenix/issues/13498
-        val isHuawei = Build.MANUFACTURER.equals("huawei", ignoreCase = true)
-        return isAndroidN || isHuawei
+        return isAndroidN || ManufacturerCodes.isHuawei
     }
 
     private fun handleBackLongPress(): Boolean {
diff --git a/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt b/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
index f41f53b8e..b1800fc87 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
@@ -19,4 +19,5 @@ object ManufacturerCodes {
 
     val isLG get() = Build.MANUFACTURER.equals(LG, ignoreCase = true)
     val isSamsung get() = Build.MANUFACTURER.equals(SAMSUNG, ignoreCase = true)
+    val isHuawei get() = Build.MANUFACTURER.equals(HUAWEI, ignoreCase = true)
 }