diff --git a/DuckDuckGo/PinnedTabs/View/PinnedTabsView.swift b/DuckDuckGo/PinnedTabs/View/PinnedTabsView.swift
index ac0496d89e..da9ae5350f 100644
--- a/DuckDuckGo/PinnedTabs/View/PinnedTabsView.swift
+++ b/DuckDuckGo/PinnedTabs/View/PinnedTabsView.swift
@@ -68,11 +68,13 @@ struct PinnedTabsView: View {
 }
 
 extension PinnedTabsView {
-    func itemIndex(for point: CGPoint) -> Int? {
-        guard (0..<PinnedTabView.Const.dimension).contains(point.y) else {
-            return nil
-        }
-        let possibleItemIndex = Int(point.x / PinnedTabView.Const.dimension)
+
+    func index(forItemAt point: CGPoint) -> Int? {
+        guard !model.items.isEmpty,
+              (0..<PinnedTabView.Const.dimension).contains(point.y) else { return nil }
+
+        let possibleItemIndex = min(model.items.count - 1, Int(point.x / PinnedTabView.Const.dimension))
         return model.items.index(model.items.startIndex, offsetBy: possibleItemIndex, limitedBy: model.items.endIndex)
     }
+
 }
diff --git a/DuckDuckGo/TabBar/View/TabBarViewController.swift b/DuckDuckGo/TabBar/View/TabBarViewController.swift
index f9ce6ccde3..8e15a07911 100644
--- a/DuckDuckGo/TabBar/View/TabBarViewController.swift
+++ b/DuckDuckGo/TabBar/View/TabBarViewController.swift
@@ -254,7 +254,7 @@ final class TabBarViewController: NSViewController {
 
     private func subscribeToPinnedTabsHostingView() {
         pinnedTabsHostingView?.middleClickPublisher
-            .compactMap { [weak self] in self?.pinnedTabsView?.itemIndex(for: $0) }
+            .compactMap { [weak self] in self?.pinnedTabsView?.index(forItemAt: $0) }
             .sink { [weak self] index in
                 self?.tabCollectionViewModel.remove(at: .pinned(index))
             }
@@ -335,18 +335,17 @@ final class TabBarViewController: NSViewController {
         }
     }
 
-    private func selectTabWithPoint(_ point: NSPoint) {
-        guard let pointLocationOnPinnedTabsView = pinnedTabsHostingView?.convert(point, from: view) else {
-            return
-        }
+    private func selectTab(with event: NSEvent) {
+        let locationInWindow = event.locationInWindow
+
+        if let point = pinnedTabsHostingView?.mouseLocationInsideBounds(locationInWindow),
+           let index = pinnedTabsView?.index(forItemAt: point) {
 
-        if let index = pinnedTabsView?.itemIndex(for: pointLocationOnPinnedTabsView) {
             tabCollectionViewModel.select(at: .pinned(index))
-        } else {
-            let pointLocationOnCollectionView = collectionView.convert(point, from: view)
-            if let indexPath = collectionView.indexPathForItem(at: pointLocationOnCollectionView) {
-                tabCollectionViewModel.select(at: .unpinned(indexPath.item))
-            }
+
+        } else if let point = collectionView.mouseLocationInsideBounds(locationInWindow),
+                  let indexPath = collectionView.indexPathForItem(at: point) {
+            tabCollectionViewModel.select(at: .unpinned(indexPath.item))
         }
     }
 
@@ -413,9 +412,9 @@ final class TabBarViewController: NSViewController {
 
     func mouseDown(with event: NSEvent) -> NSEvent? {
         if event.window === view.window,
-           view.window?.isMainWindow == false,
-           let point = view.mouseLocationInsideBounds(event.locationInWindow) {
-            selectTabWithPoint(point)
+           view.window?.isMainWindow == false {
+
+            selectTab(with: event)
         }
 
         return event