--- a/gui/src/history-dockwidget.cc
+++ b/gui/src/history-dockwidget.cc
@@ -47,6 +47,9 @@
         }
     }
 
+  // Post a new update event in a given time. This prevents flooding the
+  // event queue.
+  _update_history_model_timer.start ();
   delete e;
 }
 
@@ -95,7 +98,7 @@
            SLOT (handle_visibility_changed (bool)));
 
   _update_history_model_timer.setInterval (200);
-  _update_history_model_timer.setSingleShot (false);
+  _update_history_model_timer.setSingleShot (true);
 
   connect (&_update_history_model_timer,
            SIGNAL (timeout ()),

--- a/gui/src/octave-adapter/octave-link.cc
+++ b/gui/src/octave-adapter/octave-link.cc
@@ -123,6 +123,12 @@
 void
 octave_link::about_to_exit ()
 {
+  _event_queue_mutex->lock ();
+  while (!_event_queue.empty ())
+    _event_queue.pop ();
+
+  _event_queue_mutex->unlock ();
+
   if (_octave_event_listener)
     _octave_event_listener->about_to_exit ();
 }

--- a/gui/src/workspace-model.cc
+++ b/gui/src/workspace-model.cc
@@ -38,7 +38,7 @@
           SLOT (request_update_workspace()));
 
   _update_workspace_model_timer.setInterval (500);
-  _update_workspace_model_timer.setSingleShot (false);
+  _update_workspace_model_timer.setSingleShot (true);
   _update_workspace_model_timer.start ();
 }
 
@@ -95,6 +95,10 @@
       reset();
       emit expand_request();
     }
+
+  // Post a new event in a given time.
+  // This prevents flooding the event queue when no events are being processed.
+  _update_workspace_model_timer.start ();
   delete e;
 }