--- a/Tools__Inspector2Tab.st	Wed Jan 25 16:10:02 2017 +0100
+++ b/Tools__Inspector2Tab.st	Wed Jan 25 16:49:19 2017 +0100
@@ -50,7 +50,7 @@
             |spec browser navigationState canvas|
 
 
-            view isNil ifTrue:[
+            (view isNil ifTrue:[
                 "/ spec := #singleClassBrowserSpec.
                 spec := #multipleClassBrowserSpec.
 
@@ -68,17 +68,18 @@
                 "/ browser switchToClassHierarchyView.
                 "/ browser showInheritedMethods.
 
-                browser classListGenerator value:(aClass withAllSuperclasses).
+                navigationState classList value:(aClass theNonMetaclass withAllSuperclasses).
+                navigationState meta value:(aClass isMetaclass).
+                browser classListGenerator value:(aClass theNonMetaclass withAllSuperclasses).
                 browser sortByNameAndInheritance value:true.
                 browser
                     selectClass:aClass;
                     selectProtocol: (Tools::BrowserList nameListEntryForALL). 
-                initialSelectorOrNil notNil ifTrue:[
-                    browser selectMethod:(aClass compiledMethodAt:initialSelectorOrNil).
-                ].    
+                browser switchToClass:aClass selector:initialSelectorOrNil updateHistory: false.
                 view := ApplicationSubView new client: browser spec: spec.
+                "/ sigh must be done after postbuild
                 navigationState classListApplication addOwnerClasses value:false.
-            ].
+            ]).
             view
         ].
 
@@ -87,6 +88,10 @@
             label:label;
             viewHolder: makeView;
             yourself
+
+    "
+     GenericToolbarIconLibrary systemBrowserIcon inspect
+    "
 ! !
 
 !Inspector2Tab methodsFor:'accessing'!
@@ -192,6 +197,10 @@
 
 !Inspector2Tab class methodsFor:'documentation'!
 
+version
+    ^ '$Header$'
+!
+
 version_CVS
     ^ '$Header$'
 !