diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h
index 5c3c1ff110..19f9b3f833 100644
--- a/include/wx/taskbarbutton.h
+++ b/include/wx/taskbarbutton.h
@@ -130,6 +130,22 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxTaskBarButton);
 };
 
+class WXDLLIMPEXP_CORE wxAppProgressIndicator
+{
+public:
+    wxAppProgressIndicator(wxTopLevelWindow *parent, int maxValue);
+    virtual ~wxAppProgressIndicator();
+    bool Update(int value);
+    bool Pulse();
+
+private:
+    void Init();
+
+    wxTopLevelWindow *m_parent;
+    int m_maxValue;
+    wxScopedPtr<wxTaskBarButton> m_taskBarButton;
+};
+
 enum WXDLLIMPEXP_CORE wxJumpListItemType {
     wxJUMP_LIST_SEPARATOR,
     wxJUMP_LIST_TASK,
@@ -172,22 +188,6 @@ private:
     int      m_iconIndex;
 };
 
-class WXDLLIMPEXP_CORE wxAppProgressIndicator
-{
-public:
-    wxAppProgressIndicator(wxTopLevelWindow *parent, int maxValue);
-    virtual ~wxAppProgressIndicator() { }
-    bool Update(int value);
-    bool Pulse();
-
-private:
-    void Init();
-
-    wxTopLevelWindow *m_parent;
-    int m_maxValue;
-    wxScopedPtr<wxTaskBarButton> m_taskBarButton;
-};
-
 typedef wxVector<wxJumpListItem> wxJumpListItems;
 
 class WXDLLIMPEXP_CORE wxJumpList
diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index f703ac6cb2..1847ee545d 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -422,7 +422,7 @@ void MyFrame::OnShowProgressDialog(wxCommandEvent& WXUNUSED(event))
                            NULL,
                            wxPD_AUTO_HIDE
                         );
-    wxAppProgressIndicator indicator(&dlg, PROGRESS_COUNT);
+    wxAppProgressIndicator indicator(this, PROGRESS_COUNT);
     for ( int i = 0; i <= PROGRESS_COUNT; i++ )
     {
         if ( !dlg.Update(i) )
@@ -442,7 +442,7 @@ void MyFrame::OnPulseProgressDialog(wxCommandEvent& WXUNUSED(event))
                            NULL,
                            wxPD_AUTO_HIDE
                         );
-    wxAppProgressIndicator indicator(&dlg, PROGRESS_COUNT);
+    wxAppProgressIndicator indicator(this, PROGRESS_COUNT);
     for ( int i = 0; i <= PROGRESS_COUNT; i++ )
     {
         if ( !dlg.Pulse() )
diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index 3fd42c21fb..36df6aa38a 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -706,6 +706,11 @@ wxAppProgressIndicator::wxAppProgressIndicator(wxTopLevelWindow *parent, int max
 {
 }
 
+wxAppProgressIndicator::~wxAppProgressIndicator()
+{
+    m_taskBarButton->SetProgressState(wxTASKBAR_BUTTON_NO_PROGRESS);
+}
+
 bool wxAppProgressIndicator::Update(int value)
 {
     wxASSERT_MSG( value <= m_maxValue, wxT("invalid progress value") );