diff --git a/alliance/src/xfsm/src/XMX_event.c b/alliance/src/xfsm/src/XMX_event.c
index 8c5bb6bc..d01b588e 100644
--- a/alliance/src/xfsm/src/XMX_event.c
+++ b/alliance/src/xfsm/src/XMX_event.c
@@ -733,7 +733,7 @@ void CallbackExpose( MyWidget, ClientData, CallData )
       XfsmDisplayCursor();
     }
 
-    XfsmEnterPresentPanel();
+    /* XfsmEnterPresentPanel(); */
   }
   else
   {
diff --git a/alliance/src/xfsm/src/XTB_dialog.c b/alliance/src/xfsm/src/XTB_dialog.c
index 7df75cc7..a165821d 100644
--- a/alliance/src/xfsm/src/XTB_dialog.c
+++ b/alliance/src/xfsm/src/XTB_dialog.c
@@ -336,7 +336,9 @@ void XfsmLimitedLoop( MyWidget )
  
         if ( WShell == DialogShell )
         {
-          XtDispatchEvent( &Event );
+          XtDispatchEventToWidget( 
+                XtWindowToWidget( AnyEvent->display, AnyEvent->window ), 
+			  &Event );
         }
 
         break;
diff --git a/alliance/src/xpat/src/XMX_event.c b/alliance/src/xpat/src/XMX_event.c
index a0b8797d..c94276d0 100644
--- a/alliance/src/xpat/src/XMX_event.c
+++ b/alliance/src/xpat/src/XMX_event.c
@@ -765,7 +765,9 @@ void CallbackExpose( MyWidget, ClientData, CallData )
       XpatDisplayCursor();
     }
 
+    /* LUDO: Fed up to Click On IT ...
     XpatEnterPresentPanel();
+    */
   }
   else
   {
diff --git a/alliance/src/xpat/src/XTB_dialog.c b/alliance/src/xpat/src/XTB_dialog.c
index 4ac8bc49..4beba68f 100644
--- a/alliance/src/xpat/src/XTB_dialog.c
+++ b/alliance/src/xpat/src/XTB_dialog.c
@@ -326,9 +326,11 @@ void XpatLimitedLoop( MyWidget )
       case ButtonPress   :
       case ButtonRelease : 
  
-        if ( WShell == DialogShell )
+        if (WShell == DialogShell)
         {
-          XtDispatchEvent( &Event );
+          XtDispatchEventToWidget( 
+                XtWindowToWidget( AnyEvent->display, AnyEvent->window ), 
+			  &Event );
         }
 
         break;