diff --git a/ChangeLog b/ChangeLog
index e56b082d9..1b1f3d4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-05-23  Holger Vogt
+ * windisp.c: bug no. 3263437 (fix thanks to Robert)
+
 2011-05-22  Robert Larice
  * configure.ac ,
  * src/spicelib/devices/Makefile.am :
diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c
index 8e9360a40..882e4adeb 100644
--- a/src/frontend/wdisp/windisp.c
+++ b/src/frontend/wdisp/windisp.c
@@ -505,10 +505,9 @@ LRESULT CALLBACK PlotWindowProc( HWND hwnd,
       GRAPH * g = pGraph( hwnd);
 
       if (g) {
-         /* if g equals currentgraph, set a new currentgraph. 
-            Otherwise gr_resize(g) might fail. */
+         /* if g equals currentgraph, reset currentgraph. */
          if (g == currentgraph)
-            currentgraph = FindGraph(g->graphid - 1);
+            currentgraph = NULL;
          DestroyGraph(g->graphid);
       }
    }
@@ -538,10 +537,15 @@ LRESULT CALLBACK PlotWindowProc( HWND hwnd,
                   /* switch DC */
                   saveDC = wd->hDC;
                   wd->hDC = newDC;
-//                currentgraph = g;
                   
                   /* plot anew */
-                  gr_resize(g);
+                  {
+                      GRAPH *tmp = currentgraph;
+                      currentgraph = g;
+                      gr_resize(g);
+                      currentgraph = tmp;
+                  }
+
                   /* switch DC */
                   wd->hDC = saveDC;
                   /* ready */