diff --git a/src/app/editor/code-view/view.component.ts b/src/app/editor/code-view/view.component.ts
index 7c16d09..5ceb9f4 100644
--- a/src/app/editor/code-view/view.component.ts
+++ b/src/app/editor/code-view/view.component.ts
@@ -158,6 +158,11 @@ export class CodeViewComponent extends CodeViewBase {
             this.lspManagerService.sendMessage(message);
             this.markdownPreviewService.sendMessage(message);
 
+            message            = new ServiceMessage();
+            message.action     = "highlight-active-tab";
+            message.filePath   = this.activeFile?.path;
+            this.tabsService.sendMessage(message);
+
             this.updateInfoBar();
         });
 
diff --git a/src/app/editor/tabs/tabs.component.ts b/src/app/editor/tabs/tabs.component.ts
index 4150208..8266bf6 100644
--- a/src/app/editor/tabs/tabs.component.ts
+++ b/src/app/editor/tabs/tabs.component.ts
@@ -43,6 +43,7 @@ export class TabsComponent {
 
     tabs: any[] = this.tabsService.tabs;
     targetEvent!: any;
+    activeTab!: any;
 
 
     constructor() {
@@ -54,7 +55,7 @@ export class TabsComponent {
         this.tabsService.getMessage$().pipe(
             takeUntilDestroyed(this.#destroyRef)
         ).subscribe((message: ServiceMessage) => {
-            let elm = document.querySelectorAll(`[title="${message.filePath}"]`)[1];
+            let elm = document.querySelector(`[title="${message.filePath}"]`);
 
             switch ( message.action ) {
                 case "create-tab":
@@ -71,6 +72,24 @@ export class TabsComponent {
                 case "file-saved":
                     elm.classList.remove("file-deleted");
                     elm.classList.remove("file-changed");
+                    break;
+                case "highlight-active-tab":
+                    if (this.activeTab) {
+                        this.activeTab.classList.remove("active-tab")
+                    };
+
+                    if (!elm) break;
+
+                    this.activeTab = elm;
+                    elm.classList.add("active-tab");
+                    elm.scrollIntoView(
+                        {
+                            behavior: "smooth",
+                            block: "center",
+                            inline: "center"
+                        }
+                    );
+
                     break;
                 default:
                     break;
@@ -208,16 +227,14 @@ export class TabsComponent {
         let target = event.target;
 
         if ( target.classList.contains("tab") ) {
-            this.tabsService.sendEditorsServiceAMessage(
-                "set-tab-to-editor",
-                event.srcElement.getAttribute("title")
-            );
+            let fpath = event.srcElement.getAttribute("title")
+            this.tabsService.sendEditorsServiceAMessage("set-tab-to-editor", fpath);
 
+            this.updateActiveTabHighlight(fpath);
         } else if ( target.classList.contains("title") ) {
-            this.tabsService.sendEditorsServiceAMessage(
-                "set-tab-to-editor",
-                event.srcElement.parentElement.getAttribute("title")
-            );
+            let fpath = event.srcElement.parentElement.getAttribute("title")
+            this.tabsService.sendEditorsServiceAMessage("set-tab-to-editor", fpath);
+            this.updateActiveTabHighlight(fpath);
         } else if ( target.classList.contains("close-button") ) {
             this.tabsService.closeTab(
                 event.srcElement.parentElement.getAttribute("title")
@@ -225,4 +242,11 @@ export class TabsComponent {
         }
     }
 
+    private updateActiveTabHighlight(fpath: string): void {
+        let message      = new ServiceMessage();
+        message.action   = "highlight-active-tab";
+        message.filePath = fpath;
+        this.tabsService.sendMessage(message);
+    }
+
 }
\ No newline at end of file