diff --git a/ChangeLog b/ChangeLog
index 053df696..5b2d4dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-06-25  Markus Gans  <guru.mail@muenster.de>
+	* Move processNextEvent() code into sub functions
+
 2016-06-22  Markus Gans  <guru.mail@muenster.de>
 	* Adding required updateTerminal() calls for FMenuBar
 
diff --git a/src/fapp.cpp b/src/fapp.cpp
index 695ee728..cf25bd77 100644
--- a/src/fapp.cpp
+++ b/src/fapp.cpp
@@ -1218,14 +1218,8 @@ int FApplication::processTimerEvent()
 }
 
 //----------------------------------------------------------------------
-bool FApplication::processNextEvent()
+void FApplication::processTerminalUpdate()
 {
-  int num_events = 0;
-
-  processKeyboardEvent();
-  processMouseEvent();
-  processResizeEvent();
-
   if ( terminal_update_pending )
   {
     if ( ! input_data_pending )
@@ -1245,7 +1239,11 @@ bool FApplication::processNextEvent()
     else
       skipped_terminal_update++;
   }
+}
 
+//----------------------------------------------------------------------
+void FApplication::processCloseWidget()
+{
   if ( close_widget && ! close_widget->empty() )
   {
     widgetList::iterator iter;
@@ -1258,6 +1256,18 @@ bool FApplication::processNextEvent()
     }
     close_widget->clear();
   }
+}
+
+//----------------------------------------------------------------------
+bool FApplication::processNextEvent()
+{
+  int num_events = 0;
+
+  processKeyboardEvent();
+  processMouseEvent();
+  processResizeEvent();
+  processTerminalUpdate();
+  processCloseWidget();
 
   sendQueuedEvents();
   num_events += processTimerEvent();
diff --git a/src/fapp.h b/src/fapp.h
index 0a121d6c..ba4e83cc 100644
--- a/src/fapp.h
+++ b/src/fapp.h
@@ -137,6 +137,8 @@ class FApplication : public FWidget
    void    processMouseEvent();
    void    processResizeEvent();
    int     processTimerEvent();
+   void    processTerminalUpdate();
+   void    processCloseWidget();
    bool    processNextEvent();
    friend  class FDialog;
    friend  class FWidget;