diff --git a/pkg/ui/src/components/ResourceInfoPage.js b/pkg/ui/src/components/ResourceInfoPage.js
index e2396a98..b4711ffa 100644
--- a/pkg/ui/src/components/ResourceInfoPage.js
+++ b/pkg/ui/src/components/ResourceInfoPage.js
@@ -225,10 +225,11 @@ class ResourceInfoPage extends React.Component {
 
   render() {
 
-    let { resourceGroup, resource, logs, activeTab } = this.props
+    let { resourceGroup, resource, logs } = this.props
     let { resourceAccess } = this.state
 
     let tabs = []
+    let activeTab = this.props.activeTab
     if (!!resource) {
     
       tabs.push({
@@ -245,6 +246,8 @@ class ResourceInfoPage extends React.Component {
           icon: <IconPermissions/>,
           props: {serviceAccount: resource, resources: this.props.resources},
         })
+      } else if (activeTab === 'permissions') {
+        activeTab = null
       }
 
       if (resource.spec && resource.spec.template) {
@@ -254,6 +257,8 @@ class ResourceInfoPage extends React.Component {
           icon: <IconPodTemplate/>,
           props: {resource: resource},
         })
+      } else if (activeTab === 'pod-template') {
+        activeTab = null
       }
     }
 
@@ -271,6 +276,8 @@ class ResourceInfoPage extends React.Component {
         icon: <IconLogs/>,
         props: {logs: logs},
       })
+    } else if (activeTab === 'logs') {
+      activeTab = null
     }
 
     if (resourceAccess && resourceAccess.exec) {
@@ -280,9 +287,14 @@ class ResourceInfoPage extends React.Component {
         icon: <IconTerminal/>,
         props: {logs: logs},
       })
+    } else if (activeTab === 'terminal') {
+      activeTab = null
     }
 
-    if (!activeTab || activeTab === 'edit') {
+    if (!activeTab) {
+      this.props.selectView(tabs[0].name)
+      return null
+    } else if (activeTab === 'edit') {
       activeTab = tabs[0].name
     }