diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index be6da8ff8f4..adba84ac449 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -792,12 +792,14 @@ class CMainWindow :
     BOOL bUpdating;
 
     ATL::CStringW szSearchPattern;
+    INT SelectedEnumType;
 
 public:
     CMainWindow() :
         m_ClientPanel(NULL),
         pLink(NULL),
-        bSearchEnabled(FALSE)
+        bSearchEnabled(FALSE),
+        SelectedEnumType(ENUM_ALL_INSTALLED)
     {
     }
 
diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h
index bee3b964927..d941e52cfa2 100644
--- a/base/applications/rapps/include/winmain.h
+++ b/base/applications/rapps/include/winmain.h
@@ -25,7 +25,6 @@ typedef SETTINGS_INFO *PSETTINGS_INFO;
 
 extern HWND hMainWnd;
 extern HINSTANCE hInst;
-extern INT SelectedEnumType;
 extern SETTINGS_INFO SettingsInfo;
 
 VOID SaveSettings(HWND hwnd);
diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp
index 5d731c54368..58e100dc661 100644
--- a/base/applications/rapps/winmain.cpp
+++ b/base/applications/rapps/winmain.cpp
@@ -15,7 +15,6 @@
 
 HWND hMainWnd;
 HINSTANCE hInst;
-INT SelectedEnumType = ENUM_ALL_INSTALLED;
 SETTINGS_INFO SettingsInfo;
 
 class CRAppsModule : public CComModule