diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index b5a40808f..ec5733533 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -117,7 +117,7 @@ export default {
       ]
 
       for (const preTab of preActiveTabs) {
-        const currentTab = typeof preTab === 'object' ? preTab.name : preTab
+        const currentTab = typeof preTab === 'object' ? preTab?.name : preTab
         for (const tabName of this.tabIndices) {
           const currentTabName = tabName?.name || ''
           if (currentTab?.toLowerCase() === currentTabName?.toLowerCase()) {
diff --git a/src/views/sessions/SessionDetail/SessionDetailInfo.vue b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
index b824c1859..1bb503e75 100644
--- a/src/views/sessions/SessionDetail/SessionDetailInfo.vue
+++ b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
@@ -40,7 +40,7 @@ export default {
           attrs: {
             type: 'danger',
             label: this.$t('sessions.terminate'),
-            disabled: !this.session['can_terminate']
+            disabled: !this.session['can_terminate'] || !vm.$hasPerm('terminal.terminate_session')
           },
           callbacks: {
             click: function() {
@@ -60,7 +60,7 @@ export default {
           attrs: {
             type: 'primary',
             label: this.$t('sessions.Monitor'),
-            disabled: !this.session['can_join']
+            disabled: !this.session['can_join'] || !vm.$hasPerm('terminal.monitor_session')
           },
           callbacks: {
             click: function() {