diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5b14799bd..b6d2cf9f8 100755
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -83,3 +83,4 @@
   these:  Now support method to report if the application is a full-screen
   or a normal application.  This is necessary to prevent CTaskbar from
   displaying a task bar on top of a full-screen window.
+* NxWM::CTaskbar:  Ooops... minimizing the wrong application!
diff --git a/nxwm/src/capplicationwindow.cxx b/nxwm/src/capplicationwindow.cxx
index 60ab5a3d3..320559ef7 100644
--- a/nxwm/src/capplicationwindow.cxx
+++ b/nxwm/src/capplicationwindow.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <nuttx/nx/nxglib.h>
diff --git a/nxwm/src/cnxconsole.cxx b/nxwm/src/cnxconsole.cxx
index 264845a03..0d0f8e60e 100644
--- a/nxwm/src/cnxconsole.cxx
+++ b/nxwm/src/cnxconsole.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <cstdio>
diff --git a/nxwm/src/ctaskbar.cxx b/nxwm/src/ctaskbar.cxx
index 3305b945b..b15916b0a 100644
--- a/nxwm/src/ctaskbar.cxx
+++ b/nxwm/src/ctaskbar.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <debug.h>
@@ -521,7 +521,7 @@ bool CTaskbar::topApplication(IApplication *app)
         {
           // Yes.. then minimize the application
 
-          app->setMinimized(true);
+          m_topApp->setMinimized(true);
 
           // And make the application non-visible