diff --git a/demos/graph/mac/grmac.c b/demos/graph/mac/grmac.c
index b1435b407..189776a5a 100644
--- a/demos/graph/mac/grmac.c
+++ b/demos/graph/mac/grmac.c
@@ -198,6 +198,7 @@
           case updateEvt:
             if ( theWindow && (WindowPtr)mac_event.message == theWindow )
             {
+              SetPort( theWindow );
               BeginUpdate( theWindow );
               refresh_rectangle( surface,
                                  0, 0,
@@ -231,6 +232,10 @@
                     return;
                   }
                 }
+                else if (part == inContent)
+                {
+                  SelectWindow( theWindow );
+                }
               }
               else
               {