--- a/src/input.cc
+++ b/src/input.cc
@@ -940,7 +940,15 @@
 
   if (nargin == 0 || nargin == 1)
     {
+      unwind_protect::add_fcn (octave_call_stack::restore_frame, 
+			       octave_call_stack::current_frame ());
+
+      // Skip the frame assigned to the keyboard function.
+      octave_call_stack::goto_frame_relative (0, true);
+
       do_keyboard (args);
+
+      unwind_protect::run ();
     }
   else
     print_usage ();