diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e82c537..06dae492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Breaking change: The app now uses angular 12, making it compatible with Zowe v2 desktop and incompatible with v1 desktop.
 - Enhancement: The app now contains a manifest file so that it can be installed with `zwe components install`
 - Enhancement: Remove the opened file or dataset from Editor when deleted from file-tree.
+- BugFix: Editor keeps the content of the file, after an opened file is closed.
 
 ## `2.9.0`
 - Added the feature to update the dataset in the editor
diff --git a/webClient/src/app/editor/code-editor/file-tabs/file-tabs.component.html b/webClient/src/app/editor/code-editor/file-tabs/file-tabs.component.html
index 8a18f2aa..9e7d437c 100644
--- a/webClient/src/app/editor/code-editor/file-tabs/file-tabs.component.html
+++ b/webClient/src/app/editor/code-editor/file-tabs/file-tabs.component.html
@@ -19,7 +19,7 @@
         title="{{item.name}}"
         (contextmenu)="onRightClickTab($event, item)">
           <span class="filename">{{item.name}}</span>
-          <mat-icon class="close-file" (click)="remove.next(item)">clear</mat-icon>
+          <mat-icon class="close-file" (click)="remove.next(item);$event.stopPropagation()">clear</mat-icon>
           <mat-icon *ngIf="item.changed" class="changed-file">fiber_manual_record</mat-icon>
       </li>
     </ul>