diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7a6edf4166..af6ca54690 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19990823-01:11 EDT Paul Tucker <ptucker@sympatico.ca>
+  * source/debug/debugger.prg
+    * ::Activate - fix for trashed screens
+      Escape key is still a problem for now.
+
 19990823-01:11 GMT+1 Victor Szel <info@szelvesz.hu>
   * source/rtl/alert.prg
     ! PreExt/PostExt code moved inside Alert(), then the STATIC variable
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 6d79bfe9ea..1777220b5f 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -100,10 +100,16 @@ return Self
 
 METHOD Activate( cModuleName ) CLASS TDebugger
 
+   ::cAppImage  = SaveScreen()
+   ::nAppRow    = Row()
+   ::nAppCol    = Col()
+   ::cAppColors = SetColor()
+   ::nAppCursor = SetCursor()
    ::Show()
    ::ShowCode( cModuleName )
-   ::HandleEvent()
-   // ::Hide()
+   ::cImage := SaveScreen()
+   DispBegin()
+   RestScreen( 0, 0, MaxRow(), MaxCol(), ::cAppImage )
 
 return nil