--- a/Tools__Inspector2.st	Thu Jul 14 16:44:50 2011 +0200
+++ b/Tools__Inspector2.st	Fri Jul 15 16:27:12 2011 +0200
@@ -304,9 +304,11 @@
 !Inspector2 methodsFor:'menu & menu actions'!
 
 backButtonAction
-    self navigationHistoryHolder goBack
+    self navigationHistoryHolder goBack.
+    self updateWindowLabel
 
     "Modified: / 21-02-2008 / 19:40:23 / janfrog"
+    "Modified: / 15-07-2011 / 16:26:28 / cg"
 !
 
 backButtonMenuChannel
@@ -317,9 +319,11 @@
 !
 
 forwardButtonAction
-    self navigationHistoryHolder goForward
+    self navigationHistoryHolder goForward.
+    self updateWindowLabel
 
     "Created: / 21-02-2008 / 19:52:03 / janfrog"
+    "Modified: / 15-07-2011 / 16:26:33 / cg"
 !
 
 forwardButtonMenuChannel
@@ -351,11 +355,15 @@
 !
 
 inspect:anObject 
+    self navigationHistoryHolder 
+        currentItem: (NavigationState for: anObject).
 
-    self navigationHistoryHolder 
-        currentItem: (NavigationState for: anObject)
+    self window notNil ifTrue:[ 
+        self updateWindowLabel
+    ].
 
     "Modified: / 27-02-2008 / 12:06:52 / janfrog"
+    "Modified: / 15-07-2011 / 16:26:03 / cg"
 !
 
 openOn: anObject
@@ -364,6 +372,21 @@
 
     "Modified: / 13-01-2008 / 13:55:27 / janfrog"
     "Modified: / 11-07-2011 / 22:31:42 / cg"
+!
+
+postBuildWith:aBuilder
+    self updateWindowLabel
+
+    "Created: / 15-07-2011 / 16:25:36 / cg"
+!
+
+updateWindowLabel
+    |object|
+
+    object := self navigationHistoryHolder currentItem.
+    self window label:(InspectorView commonLabelFor:object).
+
+    "Created: / 15-07-2011 / 16:25:42 / cg"
 ! !
 
 !Inspector2::NavigationState class methodsFor:'creating classes'!
@@ -378,7 +401,7 @@
 !Inspector2::NavigationState class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__Inspector2.st,v 1.7 2011-07-11 22:08:00 cg Exp $'
+    ^'$Id: Tools__Inspector2.st,v 1.8 2011-07-15 14:27:12 cg Exp $'
 !
 
 version_SVN
@@ -539,7 +562,7 @@
 !Inspector2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.7 2011-07-11 22:08:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.8 2011-07-15 14:27:12 cg Exp $'
 !
 
 version_CVS_jvrany