diff --git a/ClassicStartSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuContainer.cpp b/ClassicStartSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuContainer.cpp
index aa527b1..4a2733a 100644
--- a/ClassicStartSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuContainer.cpp
+++ b/ClassicStartSrc/ClassicStartMenu/ClassicStartMenuDLL/MenuContainer.cpp
@@ -770,9 +770,6 @@ CMenuContainer::~CMenuContainer( void )
 	if (m_SearchIcons)
 		DeleteObject(m_SearchIcons);
 	if (m_pProgramsTree) m_pProgramsTree->Release();
-
-	if (s_pFrameworkInputPane && m_InputCookie)
-		s_pFrameworkInputPane->Unadvise(m_InputCookie);
 }
 
 void CMenuContainer::AddFirstFolder( IShellItem *pFolder, std::vector<MenuItem> &items, int options )
@@ -6215,6 +6212,10 @@ LRESULT CMenuContainer::OnDestroy( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 		CloseThemeData(m_ScrollTheme);
 		m_ScrollTheme=NULL;
 	}
+
+    if (s_pFrameworkInputPane && m_InputCookie)
+        s_pFrameworkInputPane->Unadvise(m_InputCookie);
+
 	return 0;
 }