diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue b/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue
index ef9284d..95c3faa 100644
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue
@@ -78,6 +78,15 @@ export default {
       this.selectCell(cell)
     }
   },
+  watch: {
+    currentRowIndex () {
+      if (this.selectedCellElement) {
+        const previouslySelected = this.selectedCellElement
+        this.selectCell(null)
+        this.selectCell(previouslySelected)
+      }
+    }
+  },
   methods: {
     onTableKeydown (e) {
       const keyCodeMap = {
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue b/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue
index c5c1252..0391c29 100644
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue
@@ -13,7 +13,10 @@
       <div :id="'run-result-result-set-'+tab.id" class="result-set-container"/>
       <template #right-pane v-if="viewValuePanelVisible">
         <div class="value-viewer-container">
-          <value-viewer v-show="selectedCell" :cellValue="selectedCellValue"/>
+          <value-viewer
+            v-show="selectedCell"
+            :cellValue="selectedCell ? selectedCell.innerText : ''"
+          />
         </div>
       </template>
     </component>
@@ -41,6 +44,7 @@
         :disabled="!result"
         tooltip="View record"
         tooltip-position="top-left"
+        :active="viewRecord"
         @click="toggleViewRecord"
       >
         <export-to-csv-icon/>
@@ -50,6 +54,7 @@
         :disabled="!result"
         tooltip="View value"
         tooltip-position="top-left"
+        :active="viewValuePanelVisible"
         @click="toggleViewValuePanel"
       >
         <clipboard-icon/>
@@ -147,7 +152,6 @@ export default {
       dataToCopy: null,
       viewValuePanelVisible: false,
       selectedCell: null,
-      selectedCellValue: '',
       viewRecord: false,
       defaultPage: 1,
       defaultSelectedCell: null
@@ -189,7 +193,6 @@ export default {
     result () {
       this.defaultSelectedCell = null
       this.selectedCell = null
-      this.selectedCellValue = ''
     }
   },
   methods: {
@@ -278,7 +281,6 @@ export default {
 
     onUpdateSelectedCell (e) {
       this.selectedCell = e
-      this.selectedCellValue = this.selectedCell?.innerText
     }
   }
 }