diff --git a/sample/TestDnd.cs b/sample/TestDnd.cs
index bc7eeb761..e3a36ead1 100644
--- a/sample/TestDnd.cs
+++ b/sample/TestDnd.cs
@@ -478,7 +478,7 @@ public class TestDnd {
 		Application.Init ();
 
 		window = new Gtk.Window (Gtk.WindowType.Toplevel);
-		//g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+		window.DeleteEvent += new DeleteEventHandler (OnDelete);
 
 		table = new Table (2, 2, false);
 		window.Add (table);
@@ -537,4 +537,9 @@ public class TestDnd {
 
 		Application.Run ();
 	}
+
+	private static void OnDelete (object o, DeleteEventArgs e)
+	{
+		Application.Quit ();
+	}
 }