--- a/WorkspaceCompletionSupport.st	Thu Dec 08 10:30:26 2016 +0000
+++ b/WorkspaceCompletionSupport.st	Mon Dec 12 11:58:17 2016 +0000
@@ -32,11 +32,12 @@
 
 computeCompletions
 
-    |suggestions implementations actions contextOrNil|
+    |topView suggestions implementations actions contextOrNil|
 
-    "/ a hack
-    (editView topView isKindOf: DebugView) ifTrue:[
-        contextOrNil := editView topView selectedContext.
+    "/ a hack - we get better completions, if we know the current context
+    topView := editView topView.
+    (topView notNil and:[topView isDebugView]) ifTrue:[
+        contextOrNil := topView selectedContext.
     ].
 
     UserInformation ignoreIn:[