diff --git a/sample/GtkDemo/DemoEntryCompletion.cs b/sample/GtkDemo/DemoEntryCompletion.cs
index d23220d02..3aa11a9fb 100644
--- a/sample/GtkDemo/DemoEntryCompletion.cs
+++ b/sample/GtkDemo/DemoEntryCompletion.cs
@@ -9,15 +9,16 @@ namespace GtkDemo
 		public DemoEntryCompletion () : base ("Demo Entry Completion", null, DialogFlags.DestroyWithParent)
 		{
 			this.BorderWidth = 10;
+			this.Resizable = false;
 
 			Label label = new Label ("Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
 			label.UseMarkup = true;
 			this.VBox.PackStart (label, false, true, 0);
 
 			Entry entry = new Entry ();
-			// FIXME: no way to set model
-			//entry.Completion = new EntryCompletion ();
-			//entry.SetModel (CreateCompletionModel ());
+			entry.Completion = new EntryCompletion ();
+			entry.Completion.Model = CreateCompletionModel ();
+			entry.Completion.TextColumn = 0;
 			this.VBox.PackStart (entry, false, true, 0);
 
 			this.AddButton (Stock.Close, ResponseType.Close);
diff --git a/sample/GtkDemo/README b/sample/GtkDemo/README
index cf789c847..e08a3384d 100644
--- a/sample/GtkDemo/README
+++ b/sample/GtkDemo/README
@@ -1,5 +1,5 @@
 This port of gtk-demo.c is still INCOMPLETE. If you can contribute to it
-don't hesistate to mail your patches at the gtk-sharp-list@lists.ximian.com
+don't hesitate to mail your patches to gtk-sharp-list@lists.ximian.com
 
 
 To compile it just type Make
diff --git a/sample/GtkDemo/TODO b/sample/GtkDemo/TODO
index 4487980aa..793a2f7c3 100644
--- a/sample/GtkDemo/TODO
+++ b/sample/GtkDemo/TODO
@@ -3,6 +3,7 @@ General
 
 DemoMain
  - syntax highlighting
+ - display summary info page
 
 DemoStockBrowser
  - underline _label properly