2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index d782e0a84d2..a6ad7d54ae1 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -193,7 +193,7 @@ export const unstageChange = ({ commit }, path) => {
 };
 
 export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => {
-  if (getters.activeFile && getters.activeFile === file && state.viewer === 'diff') {
+  if (getters.activeFile && getters.activeFile.path === file.path && state.viewer === 'diff') {
     return false;
   }
 
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js
index c3041c77199..7f670eb744c 100644
--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -192,6 +192,10 @@ export default {
 
         return acc.concat(f);
       }, []);
+    } else {
+      openFiles = state.openFiles.map(f =>
+        Object.assign(f, { active: f.key === key, opened: f.key === key }),
+      );
     }
 
     Object.assign(state, { openFiles });