diff --git a/Source/Project64/UserInterface/EnhancementUI.cpp b/Source/Project64/UserInterface/EnhancementUI.cpp
index e18f260c2..6579ca8e6 100644
--- a/Source/Project64/UserInterface/EnhancementUI.cpp
+++ b/Source/Project64/UserInterface/EnhancementUI.cpp
@@ -75,7 +75,8 @@ private:
 };
 
 CEnhancementUI::CEnhancementUI(void) :
-    m_hSelectedItem(NULL)
+    m_hSelectedItem(NULL),
+    m_bModal(false)
 {
 }
 
@@ -87,9 +88,7 @@ void CEnhancementUI::Display(HWND hParent, bool BlockExecution)
     }
     if (BlockExecution)
     {
-#ifdef _DEBUG
         m_bModal = true;
-#endif
         DoModal(hParent);
     }
     else if (m_hWnd != NULL)
@@ -98,9 +97,7 @@ void CEnhancementUI::Display(HWND hParent, bool BlockExecution)
     }
     else
     {
-#ifdef _DEBUG
         m_bModal = false;
-#endif
         Create(hParent);
     }
 }
diff --git a/Source/Project64/UserInterface/EnhancementUI.h b/Source/Project64/UserInterface/EnhancementUI.h
index 80b5b755f..f9e4d7e85 100644
--- a/Source/Project64/UserInterface/EnhancementUI.h
+++ b/Source/Project64/UserInterface/EnhancementUI.h
@@ -67,4 +67,5 @@ private:
     CEnhancementList m_Enhancements;
     CTreeViewCtrl m_TreeList;
     HTREEITEM m_hSelectedItem;
+    bool m_bModal;
 };