diff --git a/src/devtools/views/Components/TreeContext.js b/src/devtools/views/Components/TreeContext.js
index 940821c1a1..b83078f653 100644
--- a/src/devtools/views/Components/TreeContext.js
+++ b/src/devtools/views/Components/TreeContext.js
@@ -383,7 +383,10 @@ function reduceOwnersState(store: Store, state: State, action: Action): State {
     case 'RESET_OWNER_STACK':
       ownerStack = [];
       ownerStackIndex = null;
-      selectedElementIndex = null;
+      selectedElementIndex =
+        selectedElementID !== null
+          ? store.getIndexOfElementID(selectedElementID)
+          : null;
       _ownerFlatTree = null;
       break;
     case 'SELECT_ELEMENT_AT_INDEX':