diff --git a/src/renderer/components/dock/log-controls.tsx b/src/renderer/components/dock/log-controls.tsx
index cedff7fbb9..566dc15ba4 100644
--- a/src/renderer/components/dock/log-controls.tsx
+++ b/src/renderer/components/dock/log-controls.tsx
@@ -5,22 +5,23 @@ import { observer } from "mobx-react";
 
 import { Pod } from "../../api/endpoints";
 import { cssNames, saveFileDialog } from "../../utils";
-import { IPodLogsData, podLogsStore } from "./log.store";
+import { logStore } from "./log.store";
 import { Checkbox } from "../checkbox";
 import { Icon } from "../icon";
+import { LogTabData } from "./log-tab.store";
 
 interface Props {
-  tabData: IPodLogsData
+  tabData: LogTabData
   logs: string[]
-  save: (data: Partial<IPodLogsData>) => void
+  save: (data: Partial<LogTabData>) => void
   reload: () => void
 }
 
 export const LogControls = observer((props: Props) => {
   const { tabData, save, reload, logs } = props;
   const { showTimestamps, previous } = tabData;
-  const since = logs.length ? podLogsStore.getTimestamps(logs[0]) : null;
-  const pod = new Pod(tabData.pod);
+  const since = logs.length ? logStore.getTimestamps(logs[0]) : null;
+  const pod = new Pod(tabData.selectedPod);
 
   const toggleTimestamps = () => {
     save({ showTimestamps: !showTimestamps });
@@ -33,7 +34,7 @@ export const LogControls = observer((props: Props) => {
 
   const downloadLogs = () => {
     const fileName = pod.getName();
-    const logsToDownload = showTimestamps ? logs : podLogsStore.logsWithoutTimestamps;
+    const logsToDownload = showTimestamps ? logs : logStore.logsWithoutTimestamps;
 
     saveFileDialog(`${fileName}.log`, logsToDownload.join("\n"), "text/plain");
   };
diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx
index 74d64d2f58..3b66f42d86 100644
--- a/src/renderer/components/dock/log-list.tsx
+++ b/src/renderer/components/dock/log-list.tsx
@@ -14,7 +14,8 @@ import { Button } from "../button";
 import { Icon } from "../icon";
 import { Spinner } from "../spinner";
 import { VirtualList } from "../virtual-list";
-import { podLogsStore } from "./log.store";
+import { logStore } from "./log.store";
+import { logTabStore } from "./log-tab.store";
 
 interface Props {
   logs: string[]
@@ -77,10 +78,10 @@ export class LogList extends React.Component<Props> {
    */
   @computed
   get logs() {
-    const showTimestamps = podLogsStore.getData(this.props.id).showTimestamps;
+    const showTimestamps = logTabStore.getData(this.props.id).showTimestamps;
 
     if (!showTimestamps) {
-      return podLogsStore.logsWithoutTimestamps;
+      return logStore.logsWithoutTimestamps;
     }
 
     return this.props.logs;
diff --git a/src/renderer/components/dock/log-resource-selector.tsx b/src/renderer/components/dock/log-resource-selector.tsx
index a4b79bcfad..709542734b 100644
--- a/src/renderer/components/dock/log-resource-selector.tsx
+++ b/src/renderer/components/dock/log-resource-selector.tsx
@@ -3,25 +3,24 @@ import "./log-resource-selector.scss";
 import React from "react";
 import { observer } from "mobx-react";
 
-import { IPodContainer, Pod } from "../../api/endpoints";
+import { Pod } from "../../api/endpoints";
 import { Badge } from "../badge";
 import { Select, SelectOption } from "../select";
-import { IPodLogsData } from "./log.store";
+import { LogTabData } from "./log-tab.store";
+import { podsStore } from "../+workloads-pods/pods.store";
 
 interface Props {
-  tabData: IPodLogsData
-  save: (data: Partial<IPodLogsData>) => void
+  tabData: LogTabData
+  save: (data: Partial<LogTabData>) => void
   reload: () => void
 }
 
 export const LogResourceSelector = observer((props: Props) => {
   const { tabData, save, reload } = props;
-  const { selectedContainer, containers, initContainers } = tabData;
-  const pod = new Pod(tabData.pod);
+  const { selectedPod, selectedContainer, containers, initContainers, pods } = tabData;
+  const pod = new Pod(tabData.selectedPod);
 
   const onContainerChange = (option: SelectOption) => {
-    const { containers, initContainers } = tabData;
-
     save({
       selectedContainer: containers
         .concat(initContainers)
@@ -30,11 +29,19 @@ export const LogResourceSelector = observer((props: Props) => {
     reload();
   };
 
-  const getSelectOptions = (containers: IPodContainer[]) => {
-    return containers.map(container => {
+  const onPodChange = (option: SelectOption) => {
+    save({ selectedPod: podsStore.getByName(option.value, selectedPod.getNs()) });
+    // Change tab title
+    // Refresh container list
+    reload();
+  };
+
+
+  const getSelectOptions = (items: string[]) => {
+    return items.map(item => {
       return {
-        value: container.name,
-        label: container.name
+        value: item,
+        label: item
       };
     });
   };
@@ -42,18 +49,31 @@ export const LogResourceSelector = observer((props: Props) => {
   const containerSelectOptions = [
     {
       label: `Containers`,
-      options: getSelectOptions(containers)
+      options: getSelectOptions(containers.map(container => container.name))
     },
     {
       label: `Init Containers`,
-      options: getSelectOptions(initContainers),
+      options: getSelectOptions(initContainers.map(container => container.name)),
+    }
+  ];
+
+  const podSelectOptions = [
+    {
+      label: pod.getOwnerRefs()[0]?.name,
+      options: getSelectOptions(pods.map(pod => pod.getName()))
     }
   ];
 
   return (
     <div className="LogResourceSelector flex gaps align-center">
       <span>Namespace</span> <Badge label={pod.getNs()}/>
-      <span>Pod</span> <Badge label={pod.getName()}/>
+      <span>Pod</span>
+      <Select
+        options={podSelectOptions}
+        value={{ label: pod.getName(), value: pod.getName() }}
+        onChange={onPodChange}
+        autoConvertOptions={false}
+      />
       <span>Container</span>
       <Select
         options={containerSelectOptions}