From fba4f5f261ae480e0d9f90f852e47a3c1971dfc9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Tue, 23 Jan 2018 10:39:21 -0800
Subject: [PATCH] Ensure active item is removed before scroll

---
 src/AccessibilityManager.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AccessibilityManager.ts b/src/AccessibilityManager.ts
index 819541ae7..68681f4f1 100644
--- a/src/AccessibilityManager.ts
+++ b/src/AccessibilityManager.ts
@@ -357,11 +357,13 @@ class NavigationMode implements IDisposable {
       this._accessibilityManager.rotateRows();
     }
 
-    absoluteRow = this._terminal.scrollToRow(absoluteRow);
-
+    // Make sure there is no active element when scroll happens
     if (this._focusedElement) {
       this._focusedElement.removeAttribute('id');
     }
+
+    absoluteRow = this._terminal.scrollToRow(absoluteRow);
+
     this._absoluteFocusedRow = absoluteRow;
     this._focusedElement = this._rowElements[absoluteRow - this._terminal.buffer.ydisp];
     this._focusedElement.id = this._activeItemId;