diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
index fc3e61a56..424eb9c5e 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
@@ -490,6 +490,7 @@ public class InspectorSonarPlugin implements SonarPlugin {
         .put("children", children)
         .put("attributes", attributes)
         .put("decoration", descriptor.getDecoration(obj))
+        .put("extraInfo", descriptor.getExtraInfo(obj))
         .build();
   }
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
index c18ad462b..c3b1690e3 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
@@ -162,6 +162,15 @@ public abstract class NodeDescriptor<T> {
    */
   public abstract String getDecoration(T node) throws Exception;
 
+  /**
+   * @return Extra data about the node indicating whether the node corresponds to a node in the
+   *     other tree or if it is not represented in the other tree bu has children that should show
+   *     up, etc.
+   */
+  public SonarObject getExtraInfo(T node) {
+    return new SonarObject.Builder().build();
+  }
+
   /**
    * Test this node against a given query to see if it matches. This is used for finding search
    * results.
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
index fbc6d04a9..b47604d53 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
@@ -64,6 +64,12 @@ public class DialogFragmentDescriptor extends NodeDescriptor<DialogFragment> {
     return descriptor.getAttributes(node);
   }
 
+  @Override
+  public SonarObject getExtraInfo(DialogFragment node) {
+    final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
+    return descriptor.getExtraInfo(node);
+  }
+
   @Override
   public void setHighlighted(DialogFragment node, boolean selected) throws Exception {
     final NodeDescriptor descriptor = descriptorForClass(Dialog.class);
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
index 5f05bdb26..dbfc7f49a 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
@@ -77,6 +77,11 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
     return Arrays.asList(new Named<>("id", resourceId));
   }
 
+  @Override
+  public SonarObject getExtraInfo(Fragment node) {
+    return new SonarObject.Builder().put("nonAXWithAXChild", true).build();
+  }
+
   @Nullable
   private static String getResourceId(Fragment node) {
     final int id = node.getId();
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
index 71ccb8496..43b14f48a 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
@@ -64,6 +64,12 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor<DialogFragme
     return descriptor.getAttributes(node);
   }
 
+  @Override
+  public SonarObject getExtraInfo(DialogFragment node) {
+    final NodeDescriptor descriptor = descriptorForClass(Fragment.class);
+    return descriptor.getExtraInfo(node);
+  }
+
   @Override
   public void setHighlighted(DialogFragment node, boolean selected) throws Exception {
     final NodeDescriptor descriptor = descriptorForClass(Dialog.class);
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
index 7af9e65ee..3f477142d 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
@@ -78,6 +78,11 @@ public class SupportFragmentDescriptor extends NodeDescriptor<Fragment> {
             "id", ResourcesUtil.getIdStringQuietly(node.getContext(), node.getResources(), id)));
   }
 
+  @Override
+  public SonarObject getExtraInfo(Fragment node) {
+    return new SonarObject.Builder().put("nonAXWithAXChild", true).build();
+  }
+
   @Override
   public void setHighlighted(Fragment node, boolean selected) throws Exception {
     if (node.getView() == null) {
diff --git a/android/tests/plugins/inspector/InspectorSonarPluginTest.java b/android/tests/plugins/inspector/InspectorSonarPluginTest.java
index 75646afed..fd106de40 100644
--- a/android/tests/plugins/inspector/InspectorSonarPluginTest.java
+++ b/android/tests/plugins/inspector/InspectorSonarPluginTest.java
@@ -103,6 +103,7 @@ public class InspectorSonarPluginTest {
                 .put("children", new SonarArray.Builder().put("test"))
                 .put("attributes", new SonarArray.Builder())
                 .put("decoration", (String) null)
+                .put("extraInfo", new SonarObject.Builder())
                 .build()));
   }
 
@@ -138,7 +139,8 @@ public class InspectorSonarPluginTest {
                                 .put("data", new SonarObject.Builder())
                                 .put("children", new SonarArray.Builder())
                                 .put("attributes", new SonarArray.Builder())
-                                .put("decoration", (String) null)))
+                                .put("decoration", (String) null)
+                                .put("extraInfo", new SonarObject.Builder())))
                 .build()));
   }
 
diff --git a/src/plugins/layout/index.js b/src/plugins/layout/index.js
index 9a5b412c9..507649a3e 100644
--- a/src/plugins/layout/index.js
+++ b/src/plugins/layout/index.js
@@ -179,6 +179,13 @@ export default class Layout extends SonarPlugin<InspectorState> {
             expanded: expand,
           },
         },
+        AXelements: {
+          ...state.AXelements,
+          [key]: {
+            ...state.AXelements[key],
+            expanded: expand,
+          },
+        },
       };
     },
 
@@ -322,9 +329,7 @@ export default class Layout extends SonarPlugin<InspectorState> {
       }
 
       return this.performInitialExpand(
-        ax
-          ? this.state.AXelements[element.children[0]]
-          : this.state.elements[element.children[0]],
+        (ax ? this.state.AXelements : this.state.elements)[element.children[0]],
         ax,
       );
     });
@@ -540,11 +545,22 @@ export default class Layout extends SonarPlugin<InspectorState> {
     performance.mark('LayoutInspectorExpandElement');
     if (expand) {
       return this.getChildren(key, ax).then((elements: Array<Element>) => {
-        this.props.logger.trackTimeSince('LayoutInspectorExpandElement');
         this.dispatchAction({
           elements,
           type: ax ? 'UpdateAXElements' : 'UpdateElements',
         });
+
+        // only expand extra components in the main tree when in AX mode
+        if (this.state.inAXMode && !ax) {
+          // expand child wrapper elements that aren't in the AX tree (e.g. fragments)
+          for (const childElem of elements) {
+            if (childElem.extraInfo.nonAXWithAXChild) {
+              this.setElementExpanded(childElem.id, true, false);
+            }
+          }
+        }
+
+        this.props.logger.trackTimeSince('LayoutInspectorExpandElement');
         return Promise.resolve(elements);
       });
     } else {
@@ -583,19 +599,9 @@ export default class Layout extends SonarPlugin<InspectorState> {
   onElementExpanded = (key: ElementID, deep: boolean) => {
     if (deep) {
       this.deepExpandElement(key, false);
-    } else {
-      this.expandElement(key, false);
-    }
-    this.props.logger.track('usage', 'layout:element-expanded', {
-      id: key,
-      deep: deep,
-    });
-  };
-
-  onAXElementExpanded = (key: ElementID, deep: boolean) => {
-    if (deep) {
       this.deepExpandElement(key, true);
     } else {
+      this.expandElement(key, false);
       this.expandElement(key, true);
     }
     this.props.logger.track('usage', 'layout:element-expanded', {
@@ -621,11 +627,6 @@ export default class Layout extends SonarPlugin<InspectorState> {
     this.getNodes([key], true, false).then((elements: Array<Element>) => {
       this.dispatchAction({elements, type: 'UpdateElements'});
     });
-  });
-
-  onAXElementSelected = debounce((key: ElementID) => {
-    this.dispatchAction({key, type: 'SelectElement'});
-    this.client.send('setHighlighted', {id: key});
     this.getNodes([key], true, true).then((elements: Array<Element>) => {
       this.dispatchAction({elements, type: 'UpdateAXElements'});
     });
@@ -635,10 +636,6 @@ export default class Layout extends SonarPlugin<InspectorState> {
     this.client.send('setHighlighted', {id: key});
   });
 
-  onAXElementHovered = debounce((key: ?ElementID) => {
-    this.client.send('setHighlighted', {id: key});
-  });
-
   onDataValueChanged = (path: Array<string>, value: any) => {
     const selected = this.state.inAXMode
       ? this.state.AXselected
@@ -757,9 +754,9 @@ export default class Layout extends SonarPlugin<InspectorState> {
           {AXinitialised && inAXMode ? <VerticalRule /> : null}
           {AXinitialised && inAXMode ? (
             <AXElementsInspector
-              onElementSelected={this.onAXElementSelected}
-              onElementHovered={this.onAXElementHovered}
-              onElementExpanded={this.onAXElementExpanded}
+              onElementSelected={this.onElementSelected}
+              onElementHovered={this.onElementHovered}
+              onElementExpanded={this.onElementExpanded}
               onValueChanged={this.onDataValueChanged}
               selected={AXselected}
               searchResults={null}
diff --git a/src/ui/components/elements-inspector/ElementsInspector.js b/src/ui/components/elements-inspector/ElementsInspector.js
index 04376a693..dfa94714a 100644
--- a/src/ui/components/elements-inspector/ElementsInspector.js
+++ b/src/ui/components/elements-inspector/ElementsInspector.js
@@ -34,6 +34,10 @@ export type ElementAttribute = {|
   value: string,
 |};
 
+export type ElementExtraInfo = {|
+  nonAXWithAXChild?: boolean,
+|};
+
 export type Element = {|
   id: ElementID,
   name: string,
@@ -42,6 +46,7 @@ export type Element = {|
   attributes: Array<ElementAttribute>,
   data: ElementData,
   decoration: string,
+  extraInfo: ElementExtraInfo,
 |};
 
 export default class ElementsInspector extends Component<{