diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
index 7daca8ec32b..0a1d51ad722 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
@@ -727,9 +727,9 @@ public class Rendering extends Composite implements IDebugEventSetListener
         public void dispose()
         {
             fDisposed = true;
-            synchronized(this)
+            synchronized(fQueue)
             {
-                this.notify();
+            	fQueue.notify();
             }
         }
         
@@ -789,10 +789,7 @@ public class Rendering extends Composite implements IDebugEventSetListener
         			fQueue.addElement(element);
                 	fLastQueued = element;
                 }
-            }
-            synchronized(this)
-            {
-                this.notify();
+        		fQueue.notify();
             }
         }
 
@@ -836,11 +833,14 @@ public class Rendering extends Composite implements IDebugEventSetListener
                 }
                 else
                 {
-                    synchronized(this)
+                    synchronized(fQueue)
                     {
                         try
                         {
-                            this.wait();
+                        	if(fQueue.isEmpty())
+                        	{
+                        		fQueue.wait();
+                        	}
                         }
                         catch(Exception e)
                         {