diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1958ab30e0..b7c33521d1 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -917,9 +917,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
             {
                 int idx;
                 idx = m_listbox->GetSelection();
-                m_listbox->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_listbox->Delete( idx );
                 idx = m_listboxSorted->GetSelection();
-                m_listboxSorted->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_listboxSorted->Delete( idx );
                 break;
             }
         case ID_LISTBOX_FONT:
@@ -1000,9 +1002,11 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
         case ID_CHOICE_DELETE:
             {
                 int idx = m_choice->GetSelection();
-                m_choice->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_choice->Delete( idx );
                 idx = m_choiceSorted->GetSelection();
-                m_choiceSorted->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_choiceSorted->Delete( idx );
                 break;
             }
         case ID_CHOICE_FONT:
diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index e67de81a3b..353da6b737 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -531,10 +531,13 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
             WriteText("\n");
             break;
 
-        default:
-            LogEvent( wxT("Key down"), event);
+        case WXK_F6:
+            SetValue("F6 was just pressed.");
+            break;
     }
 
+    LogEvent( wxT("Key down"), event);
+
     event.Skip();
 }