diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js
index db3893b97d4aa12b865074ec62ae43ae248aee53..4fafcfd0ea1d42b870ad17391713e5bd0dbc2604 100644
--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -8,7 +8,9 @@ export default {
 
     if (active && !state.entries[path].pending) {
       Object.assign(state, {
-        openFiles: state.openFiles.map(f => Object.assign(f, { active: !(f.pending && f.active) })),
+        openFiles: state.openFiles.map(f =>
+          Object.assign(f, { active: f.pending ? false : f.active }),
+        ),
       });
     }
   },
diff --git a/spec/javascripts/ide/stores/mutations/file_spec.js b/spec/javascripts/ide/stores/mutations/file_spec.js
index 3f379ff219b8ced4fe6f91babad69ed7c138fd7d..4f9e00b8543612e79fe0fe62d13a6a24908e8591 100644
--- a/spec/javascripts/ide/stores/mutations/file_spec.js
+++ b/spec/javascripts/ide/stores/mutations/file_spec.js
@@ -27,6 +27,7 @@ describe('Multi-file store file mutations', () => {
       localState.openFiles.push({
         ...localFile,
         pending: true,
+        active: true,
       });
 
       mutations.SET_FILE_ACTIVE(localState, {