diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index e1a9df5fe..6b1bf2316 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -251,10 +251,10 @@ class BrowserToolbarView(
     }
 
     private fun ToolbarMenu.Item.performHapticIfNeeded(view: View) {
-        (this as? ToolbarMenu.Item.Reload)?.also { reload ->
-            if (reload.bypassCache) {
-                view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
-            }
+        if (this is ToolbarMenu.Item.Reload && this.bypassCache ||
+            this is ToolbarMenu.Item.Forward && this.viewHistory
+        ) {
+            view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
         }
     }
 }