diff --git a/DuckDuckGo/Browser Tab/Model/Tab.swift b/DuckDuckGo/Browser Tab/Model/Tab.swift
index 54ea0e1336..a70b560f8c 100644
--- a/DuckDuckGo/Browser Tab/Model/Tab.swift	
+++ b/DuckDuckGo/Browser Tab/Model/Tab.swift	
@@ -332,23 +332,28 @@ final class Tab: NSObject, Identifiable {
     }
 
     func goForward() {
-        guard self.canGoForward else { return }
+        guard canGoForward else { return }
         shouldStoreNextVisit = false
         webView.goForward()
     }
 
     var canGoBack: Bool {
-        webView.canGoBack
+        webView.canGoBack || error != nil
     }
 
     func goBack() {
-        guard self.canGoBack else {
+        guard canGoBack else {
             if canBeClosedWithBack {
                 delegate?.closeTab(self)
             }
             return
         }
 
+        guard error == nil else {
+            webView.reload()
+            return
+        }
+
         shouldStoreNextVisit = false
         webView.goBack()
     }
diff --git a/DuckDuckGo/Browser Tab/View/Base.lproj/BrowserTab.storyboard b/DuckDuckGo/Browser Tab/View/Base.lproj/BrowserTab.storyboard
index 3ab6fd3b61..f23dec6352 100644
--- a/DuckDuckGo/Browser Tab/View/Base.lproj/BrowserTab.storyboard	
+++ b/DuckDuckGo/Browser Tab/View/Base.lproj/BrowserTab.storyboard	
@@ -12,29 +12,29 @@
             <objects>
                 <viewController id="D9y-55-iLO" customClass="BrowserTabViewController" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="aev-t9-Epw" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="512" height="492"/>
+                        <rect key="frame" x="0.0" y="0.0" width="513" height="492"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <containerView translatesAutoresizingMaskIntoConstraints="NO" id="aUo-25-0iW">
-                                <rect key="frame" x="0.0" y="0.0" width="512" height="492"/>
+                                <rect key="frame" x="0.0" y="0.0" width="513" height="492"/>
                                 <connections>
                                     <segue destination="fQy-ie-1zy" kind="embed" destinationCreationSelector="createHomePageViewController:" id="XdA-0x-M1n"/>
                                 </connections>
                             </containerView>
                             <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bol-qn-wuI" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="512" height="492"/>
+                                <rect key="frame" x="0.0" y="0.0" width="513" height="492"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RNn-86-Wkx">
-                                        <rect key="frame" x="140" y="253" width="232" height="17"/>
+                                        <rect key="frame" x="141" y="253" width="232" height="17"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="DuckDuckGo can’t load this page." id="W60-yd-bv3">
                                             <font key="font" metaFont="systemSemibold" size="14"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iH5-FT-P9e">
-                                        <rect key="frame" x="157" y="228" width="199" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="An unknown error has occurred." id="rLZ-IC-OXf">
+                                    <textField horizontalHuggingPriority="351" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="iH5-FT-P9e">
+                                        <rect key="frame" x="157" y="229" width="199" height="16"/>
+                                        <textFieldCell key="cell" title="An unknown error has occurred." id="rLZ-IC-OXf">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -42,9 +42,11 @@
                                     </textField>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="iH5-FT-P9e" firstAttribute="centerY" secondItem="bol-qn-wuI" secondAttribute="centerY" constant="10" id="F05-mw-7Re"/>
+                                    <constraint firstItem="iH5-FT-P9e" firstAttribute="top" secondItem="RNn-86-Wkx" secondAttribute="bottom" constant="8" id="TGu-KU-L1y"/>
                                     <constraint firstItem="RNn-86-Wkx" firstAttribute="centerY" secondItem="bol-qn-wuI" secondAttribute="centerY" constant="-15" id="m7c-MA-Rcm"/>
+                                    <constraint firstItem="iH5-FT-P9e" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bol-qn-wuI" secondAttribute="leading" constant="20" id="mJQ-P7-aBb"/>
                                     <constraint firstItem="RNn-86-Wkx" firstAttribute="centerX" secondItem="bol-qn-wuI" secondAttribute="centerX" id="nuD-3G-hI8"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="iH5-FT-P9e" secondAttribute="trailing" constant="20" id="qCW-WQ-F8g"/>
                                     <constraint firstItem="iH5-FT-P9e" firstAttribute="centerX" secondItem="bol-qn-wuI" secondAttribute="centerX" id="tff-7d-2X3"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
diff --git a/DuckDuckGo/Browser Tab/ViewModel/TabViewModel.swift b/DuckDuckGo/Browser Tab/ViewModel/TabViewModel.swift
index 996d9382cf..8b56a5a845 100644
--- a/DuckDuckGo/Browser Tab/ViewModel/TabViewModel.swift	
+++ b/DuckDuckGo/Browser Tab/ViewModel/TabViewModel.swift	
@@ -35,7 +35,7 @@ final class TabViewModel {
 
     private var webViewStateObserver: WebViewStateObserver?
 
-    @Published var canGoForward: Bool = false
+    @Published private(set) var canGoForward: Bool = false
     @Published private(set) var canGoBack: Bool = false
     @Published private(set) var canReload: Bool = false
     @Published var canBeBookmarked: Bool = false
@@ -58,6 +58,8 @@ final class TabViewModel {
             updateAddressBarStrings()
             updateTitle()
             updateFavicon()
+            updateCanGoBack()
+            updateCanGoForward()
         }
     }
 
@@ -134,7 +136,7 @@ final class TabViewModel {
                 switch error {
                 case .none, // no error
                     // don‘t show error for interrupted load like downloads
-                    .some(WebKitError.frameLoadInterrupted):
+                        .some(WebKitError.frameLoadInterrupted):
                     return .init(isVisible: false, message: nil)
                 case .some(let error):
                     return .init(isVisible: true, message: error.localizedDescription)
@@ -169,7 +171,11 @@ final class TabViewModel {
     }
 
     func updateCanGoBack() {
-        canGoBack = tab.canGoBack || tab.canBeClosedWithBack
+        canGoBack = tab.canGoBack || tab.canBeClosedWithBack || tab.error != nil
+    }
+
+    func updateCanGoForward() {
+        canGoForward = tab.canGoForward && tab.error == nil
     }
 
     private func updateCanBeBookmarked() {
diff --git a/DuckDuckGo/Browser Tab/ViewModel/WebViewStateObserver.swift b/DuckDuckGo/Browser Tab/ViewModel/WebViewStateObserver.swift
index 01601af20e..0213373199 100644
--- a/DuckDuckGo/Browser Tab/ViewModel/WebViewStateObserver.swift	
+++ b/DuckDuckGo/Browser Tab/ViewModel/WebViewStateObserver.swift	
@@ -65,7 +65,7 @@ final class WebViewStateObserver: NSObject {
         }
 
         tabViewModel.updateCanGoBack()
-        tabViewModel.canGoForward = webView.canGoForward
+        tabViewModel.updateCanGoForward()
         tabViewModel.isWebViewLoading = webView.isLoading
     }
 
@@ -98,7 +98,7 @@ final class WebViewStateObserver: NSObject {
             updateTitle() // The title might not change if webView doesn't think anything is different so update title here as well
 
         case #keyPath(WKWebView.canGoBack): tabViewModel.updateCanGoBack()
-        case #keyPath(WKWebView.canGoForward): tabViewModel.canGoForward = webView.canGoForward
+        case #keyPath(WKWebView.canGoForward): tabViewModel.updateCanGoForward()
         case #keyPath(WKWebView.isLoading): tabViewModel.isWebViewLoading = webView.isLoading
         case #keyPath(WKWebView.title):
             updateTitle()
diff --git a/DuckDuckGo/Common/View/AppKit/ProgressView.swift b/DuckDuckGo/Common/View/AppKit/ProgressView.swift
index 467950d836..622c379fc0 100644
--- a/DuckDuckGo/Common/View/AppKit/ProgressView.swift
+++ b/DuckDuckGo/Common/View/AppKit/ProgressView.swift
@@ -179,7 +179,9 @@ final class ProgressView: NSView, CAAnimationDelegate {
         if (animationDuration ?? 0) > 0 {
             CATransaction.commit()
         } else {
-            self.progressAnimationDidStop(finished: true)
+            DispatchQueue.main.async {
+                self.progressAnimationDidStop(finished: true)
+            }
         }
     }
 
diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift b/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift
index 7a3c3e264a..3957d2c38f 100644
--- a/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift	
+++ b/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift	
@@ -276,7 +276,6 @@ final class AddressBarTextField: NSTextField {
             Pixel.fire(.refresh(source: .reloadURL))
             selectedTabViewModel.reload()
         } else {
-
             Pixel.fire(.navigation(kind: .init(url: url), source: suggestion != nil ? .suggestion : .addressBar))
             selectedTabViewModel.tab.update(url: url)
         }
diff --git a/DuckDuckGo/Navigation Bar/View/NavigationButtonMenuDelegate.swift b/DuckDuckGo/Navigation Bar/View/NavigationButtonMenuDelegate.swift
index 130cdd4e49..5f6af1f238 100644
--- a/DuckDuckGo/Navigation Bar/View/NavigationButtonMenuDelegate.swift	
+++ b/DuckDuckGo/Navigation Bar/View/NavigationButtonMenuDelegate.swift	
@@ -40,23 +40,17 @@ final class NavigationButtonMenuDelegate: NSObject {
 extension NavigationButtonMenuDelegate: NSMenuDelegate {
 
     func numberOfItems(in menu: NSMenu) -> Int {
-        if listItems.count > 1 {
-            return listItems.count
-        } else if tabCollectionViewModel.selectedTabViewModel?.tab.canBeClosedWithBack == true {
-            return 1
-        }
-        return 0
+        let listItems = listItems
+
+        // Don't show menu if there is just the current item
+        if listItems.items.count == 0 || (listItems.items.count == 1 && listItems.currentIndex == 0) { return 0 }
+
+        return listItems.items.count
     }
 
     func menu(_ menu: NSMenu, update item: NSMenuItem, at index: Int, shouldCancel: Bool) -> Bool {
-        let listItems = self.listItems
-        let listItem: BackForwardListItem
-        if listItems.count > 1,
-           let item = listItems[safe: index] {
-            listItem = .backForwardListItem(item)
-        } else if let parentTab = tabCollectionViewModel.selectedTabViewModel?.tab.parentTab {
-            listItem = .goBackToCloseItem(parentTab: parentTab)
-        } else {
+        let (listItems, currentIndex) = self.listItems
+        guard let listItem = listItems[safe: index] else {
             os_log("%s: Index out of bounds", type: .error, className)
             return true
         }
@@ -64,29 +58,27 @@ extension NavigationButtonMenuDelegate: NSMenuDelegate {
         let listItemViewModel = WKBackForwardListItemViewModel(backForwardListItem: listItem,
                                                                faviconManagement: FaviconManager.shared,
                                                                historyCoordinating: HistoryCoordinator.shared,
-                                                               isCurrentItem: listItems[safe: index] === currentListItem)
+                                                               isCurrentItem: index == currentIndex)
 
         item.title = listItemViewModel.title
         item.image = listItemViewModel.image
         item.state =  listItemViewModel.state
 
         item.target = self
-        item.action = listItemViewModel.isGoBackToCloseItem ? #selector(goBackAction(_:)) : #selector(menuItemAction(_:))
+        item.action = #selector(menuItemAction(_:))
         item.tag = index
         return true
     }
 
     @objc func menuItemAction(_ sender: NSMenuItem) {
         let index = sender.tag
-        let listItems = self.listItems
-
-        guard index < listItems.count else {
+        let (listItems, currentIndex) = self.listItems
+        guard let listItem = listItems[safe: index] else {
             os_log("%s: Index out of bounds", type: .error, className)
             return
         }
-        let listItem = listItems[index]
 
-        guard listItem !== currentListItem else {
+        guard currentIndex != index else {
             // current item selected: do nothing
             return
         }
@@ -95,37 +87,52 @@ extension NavigationButtonMenuDelegate: NSMenuDelegate {
             return
         }
 
-        selectedTabViewModel.tab.go(to: listItem)
-    }
-
-    @objc func goBackAction(_: NSMenuItem) {
-        tabCollectionViewModel.selectedTabViewModel?.tab.goBack()
+        switch listItem {
+        case .backForwardListItem(let wkListItem):
+            selectedTabViewModel.tab.go(to: wkListItem)
+        case .goBackToCloseItem(parentTab:):
+            tabCollectionViewModel.selectedTabViewModel?.tab.goBack()
+        case .error:
+            break
+        }
     }
 
-    private var listItems: [WKBackForwardListItem] {
+    private var listItems: (items: [BackForwardListItem], currentIndex: Int?) {
         guard let selectedTabViewModel = tabCollectionViewModel.selectedTabViewModel else {
             os_log("%s: Selected tab view model is nil", type: .error, className)
-            return []
+            return ([], nil)
         }
 
         let backForwardList = selectedTabViewModel.tab.webView.backForwardList
-        var list = buttonType == .back ? backForwardList.backList.reversed() : backForwardList.forwardList
-
-        guard let currentItem = selectedTabViewModel.tab.webView.backForwardList.currentItem else {
-            return list
+        let wkList = buttonType == .back ? backForwardList.backList.reversed() : backForwardList.forwardList
+        var list = wkList.map { BackForwardListItem.backForwardListItem($0) }
+        var currentIndex: Int?
+
+        // Add closing with back button to the list
+        if list.count == 0,
+            let parentTab = selectedTabViewModel.tab.parentTab,
+            buttonType == .back {
+            list.insert(.goBackToCloseItem(parentTab: parentTab), at: 0)
         }
-        list.insert(currentItem, at: 0)
 
-        return list
-    }
+        // Add current item to the list
+        if let currentItem = selectedTabViewModel.tab.webView.backForwardList.currentItem {
+            list.insert(.backForwardListItem(currentItem), at: 0)
+            currentIndex = 0
+        }
 
-    private var currentListItem: WKBackForwardListItem? {
-        guard let selectedTabViewModel = tabCollectionViewModel.selectedTabViewModel else {
-            os_log("%s: Selected tab view model is nil", type: .error, className)
-            return nil
+        // Add error to the list
+        if selectedTabViewModel.tab.error != nil {
+            if buttonType == .back {
+                list.insert(.error, at: 0)
+                currentIndex = 0
+            } else {
+                list = []
+                currentIndex = nil
+            }
         }
 
-        return selectedTabViewModel.tab.webView.backForwardList.currentItem
+        return (list, currentIndex)
     }
 
 }
diff --git a/DuckDuckGo/Navigation Bar/ViewModel/BackForwardListItem.swift b/DuckDuckGo/Navigation Bar/ViewModel/BackForwardListItem.swift
index f38d0db239..af0c0289de 100644
--- a/DuckDuckGo/Navigation Bar/ViewModel/BackForwardListItem.swift	
+++ b/DuckDuckGo/Navigation Bar/ViewModel/BackForwardListItem.swift	
@@ -18,9 +18,10 @@
 
 import WebKit
 
-enum BackForwardListItem {
+enum BackForwardListItem: Equatable {
     case backForwardListItem(WKBackForwardListItem)
     case goBackToCloseItem(parentTab: Tab)
+    case error
 
     var url: URL? {
         switch self {
@@ -28,6 +29,8 @@ enum BackForwardListItem {
             return item.url
         case .goBackToCloseItem(parentTab: let tab):
             return tab.content.url
+        case .error:
+            return nil
         }
     }
 
diff --git a/DuckDuckGo/Navigation Bar/ViewModel/WKBackForwardListItemViewModel.swift b/DuckDuckGo/Navigation Bar/ViewModel/WKBackForwardListItemViewModel.swift
index 9d16849c94..2734d0a90d 100644
--- a/DuckDuckGo/Navigation Bar/ViewModel/WKBackForwardListItemViewModel.swift	
+++ b/DuckDuckGo/Navigation Bar/ViewModel/WKBackForwardListItemViewModel.swift	
@@ -60,10 +60,16 @@ final class WKBackForwardListItemViewModel {
             } else {
                 return UserText.closeAndReturnToParent
             }
+        case .error:
+            return UserText.tabErrorTitle
         }
     }
 
     var image: NSImage? {
+        if case .error = backForwardListItem {
+            return nil
+        }
+
         if backForwardListItem.url == .homePage {
             return NSImage(named: "HomeFavicon")
         }
@@ -78,16 +84,18 @@ final class WKBackForwardListItemViewModel {
     }
 
     var state: NSControl.StateValue {
-        if case .backForwardListItem = backForwardListItem {
-            return isCurrentItem ? .on : .off
+        if case .goBackToCloseItem = backForwardListItem {
+            return .off
         }
-        return .off
+
+        return isCurrentItem ? .on : .off
     }
 
     var isGoBackToCloseItem: Bool {
         if case .goBackToCloseItem = backForwardListItem {
             return true
         }
+
         return false
     }