diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx
index 703d91f7f3..9fdeec4f6a 100644
--- a/src/renderer/components/+network-port-forwards/port-forwards.tsx
+++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx
@@ -55,9 +55,7 @@ export class PortForwards extends React.Component<Props> {
   get selectedPortForward() {
     const { match: { params: { forwardport } } } = this.props;
 
-    return portForwardStore.items.find(pf => {
-      return pf.getForwardPort() == Number(forwardport);
-    });
+    return portForwardStore.getById(forwardport);
   }
 
   onDetails = (item: PortForwardItem) => {
diff --git a/src/renderer/port-forward/port-forward.store.ts b/src/renderer/port-forward/port-forward.store.ts
index 49ebee61d4..7731d5e087 100644
--- a/src/renderer/port-forward/port-forward.store.ts
+++ b/src/renderer/port-forward/port-forward.store.ts
@@ -81,6 +81,16 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
   async removeSelectedItems() {
     return Promise.all(this.selectedItems.map(removePortForward));
   }
+
+  getById(id: string) {
+    const index = this.getIndexById(id);
+
+    if (index === -1) {
+      return null;
+    }
+    
+    return this.getItems()[index];
+  }
 }
 
 interface PortForwardResult {