--- a/ActiveHelp.st	Mon Jun 16 18:58:15 1997 +0200
+++ b/ActiveHelp.st	Mon Jun 16 18:58:43 1997 +0200
@@ -314,7 +314,7 @@
      #helpTextFor:at: or #helpTextFor: message ends this search and the
      returned string is returned."
 
-    |model text view v sv|
+    |model app text view v sv|
 
     view := aView.
     (model := aView model) notNil ifTrue:[
@@ -354,17 +354,31 @@
             text := sv helpTextFor:v.
             text notNil ifTrue:[^ text].
          ].
+
          v := sv.
     ].
 
+    (aView respondsTo:#application) ifTrue:[
+        (app := aView application) notNil ifTrue:[
+            (app respondsTo:#helpTextFor:at:) ifTrue:[
+                text := app helpTextFor:aView at:x@y.
+                text notNil ifTrue:[^ text].
+            ].
+            (app respondsTo:#helpTextFor:) ifTrue:[
+                text := app helpTextFor:aView.
+                text notNil ifTrue:[^ text].
+            ]
+        ]
+    ].
+
     (v notNil and:[v respondsTo:#application]) ifTrue:[
-        (model := v application) notNil ifTrue:[
-            (model respondsTo:#helpTextFor:at:) ifTrue:[
-                text := model helpTextFor:aView at:x@y.
+        (app := v application) notNil ifTrue:[
+            (app respondsTo:#helpTextFor:at:) ifTrue:[
+                text := app helpTextFor:aView at:x@y.
                 text notNil ifTrue:[^ text].
             ].
-            (model respondsTo:#helpTextFor:) ifTrue:[
-                text := model helpTextFor:aView.
+            (app respondsTo:#helpTextFor:) ifTrue:[
+                text := app helpTextFor:aView.
                 text notNil ifTrue:[^ text].
             ]
         ]
@@ -479,7 +493,8 @@
     "/ (i.e. in its own information area)
 
     top := view topView.
-    (app := top application) notNil ifTrue:[
+
+    (app := view application) notNil ifTrue:[
         (app showHelp:aHelpText for:view) ifTrue:[
             ^ self
         ]
@@ -538,6 +553,6 @@
 !ActiveHelp class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ActiveHelp.st,v 1.19 1997-06-15 10:15:40 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ActiveHelp.st,v 1.20 1997-06-16 16:58:43 ca Exp $'
 ! !
 ActiveHelp initialize!