diff --git a/Classes/ExplorerInterface/FLEXExplorerViewController.m b/Classes/ExplorerInterface/FLEXExplorerViewController.m
index 8635e6c..cadfe8e 100644
--- a/Classes/ExplorerInterface/FLEXExplorerViewController.m
+++ b/Classes/ExplorerInterface/FLEXExplorerViewController.m
@@ -851,7 +851,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     UIMenuController.sharedMenuController.menuItems = @[copyObjectAddress];
     [UIMenuController.sharedMenuController update];
     
-    // Show the view controller.
+    // Show the view controller
     [super presentViewController:toPresent animated:animated completion:completion];
 }
 
diff --git a/Classes/ViewHierarchy/FLEXHierarchyViewController.m b/Classes/ViewHierarchy/FLEXHierarchyViewController.m
index 16e1837..8aa1a99 100644
--- a/Classes/ViewHierarchy/FLEXHierarchyViewController.m
+++ b/Classes/ViewHierarchy/FLEXHierarchyViewController.m
@@ -10,6 +10,7 @@
 #import "FLEXHierarchyTableViewController.h"
 #import "FHSViewController.h"
 #import "FLEXUtility.h"
+#import "FLEXTabList.h"
 
 typedef NS_ENUM(NSUInteger, FLEXHierarchyViewMode) {
     FLEXHierarchyViewModeTree = 1,
@@ -97,6 +98,9 @@ typedef NS_ENUM(NSUInteger, FLEXHierarchyViewMode) {
 #pragma mark - Private
 
 - (void)donePressed {
+    // We need to manually close ourselves here because
+    // FLEXNavigationController doesn't ever close tabs itself 
+    [FLEXTabList.sharedList closeTab:self];
     [self.hierarchyDelegate viewHierarchyDidDismiss:self.selectedView];
 }