diff --git a/Source/Examples/ExampleBrowser.cs b/Source/Examples/ExampleBrowser.cs
index 5edd3f7a..2bd0b7b7 100644
--- a/Source/Examples/ExampleBrowser.cs
+++ b/Source/Examples/ExampleBrowser.cs
@@ -14,6 +14,8 @@ namespace Examples
 
         //PrivateFontCollection font_collection = new PrivateFontCollection();
 
+        bool show_warning = true;
+
         #endregion
 
         #region Constructors
@@ -52,6 +54,16 @@ namespace Examples
             LoadSamplesFromAssembly(Assembly.GetExecutingAssembly());
         }
 
+        protected override void OnShown(EventArgs e)
+        {
+            if (show_warning)
+            {
+                MessageBox.Show("The new Sample Browser is not complete. Please report any issues at http://www.opentk.com/project/issues.",
+                    "Work in Progress", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                show_warning = false;
+            }
+        }
+
         #endregion
 
         #region Private Members
diff --git a/Source/Examples/Main.cs b/Source/Examples/Main.cs
index 4ed4e1df..f2b4074a 100644
--- a/Source/Examples/Main.cs
+++ b/Source/Examples/Main.cs
@@ -17,7 +17,7 @@ namespace Examples
             {
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
-                //using (Form browser = new ExampleLauncher())
+
                 using (Form browser = new ExampleBrowser())
                 {
                     try