diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8bc0872b05..be06426b9c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+19990829-01:20 EDT Paul Tucker <ptucker@sympatico.ca>
+   * source/debug/debugger.prg
+     * ::Activate  - call restoreAppStatus() since code was the same.
+     * ::Go added a DispEnd()
+     * __dbgEntry() Modified so that the app Screen is visible when
+       you select 'go' (F5)
+       The dispbegins/Ends here seem a bit weird, but this is temporary
+       as I'm working on a more permanent solution for the debugger to
+       do screen handling.
+
 19990828-22:20 EDT Paul Tucker <ptucker@sympatico.ca>
    * source/rtl/filesys.c
      * modified FO_ flags handling slightly to correctly reflect their state.
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 6705d81381..66ba201102 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -55,20 +55,20 @@ function __dbgEntry( uParam )  // debugger entry point
 
       case ValType( uParam ) == "N"   // called from hvm.c hb_vmDebuggerShowLines()
            if oDebugger != nil
-              oDebugger:SaveAppStatus()
               if oDebugger:lGo
                  oDebugger:lGo = ! oDebugger:IsBreakPoint( uParam )
               endif
-              if ! oDebugger:lGo
+              if oDebugger:lGo
+                 DispBegin()
+                 DispBegin()
+                 oDebugger:SaveAppStatus()
+                 oDebugger:RestoreAppStatus()
+                 DispEnd()
+                 DispEnd()
+              else
+                 oDebugger:SaveAppStatus()
                  oDebugger:GoToLine( uParam )
                  oDebugger:HandleEvent()
-              else
-                 oDebugger:cImage = SaveScreen()
-                 DispBegin()
-                 RestScreen( 0, 0, MaxRow(), MaxCol(), oDebugger:cAppImage )
-                 SetPos( oDebugger:nAppRow, oDebugger:nAppCol )
-                 SetColor( oDebugger:cAppColors )
-                 SetCursor( oDebugger:nAppCursor )
               endif
            endif
 
@@ -96,7 +96,7 @@ CLASS TDebugger
    METHOD Activate( cModuleName )
    METHOD EndProc()
    METHOD Exit() INLINE ::lEnd := .t.
-   METHOD Go() INLINE ::RestoreAppStatus(), ::lGo := .t., ::Exit()
+   METHOD Go() INLINE ::RestoreAppStatus(), ::lGo := .t., DispEnd(), ::Exit()
    METHOD GoToLine( nLine )
    METHOD HandleEvent()
    METHOD Hide()
@@ -138,12 +138,7 @@ METHOD Activate( cModuleName ) CLASS TDebugger
    ::Show()
    ::ShowCode( cModuleName )
    ::ShowCallStack()
-   ::cImage := SaveScreen()
-   DispBegin()
-   RestScreen( 0, 0, MaxRow(), MaxCol(), ::cAppImage )
-   SetPos( ::nAppRow, ::nAppCol )
-   SetColor( ::cAppColors )
-   SetCursor( ::nAppCursor )
+   ::RestoreAppStatus()
 
 return nil
 
@@ -177,6 +172,7 @@ METHOD HandleEvent() CLASS TDebugger
               ::RestoreAppStatus()
               oDebugger := nil
               lExit := .T.
+              DispEnd()
               ::Exit()
 
          case nKey == K_UP