diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index f224494e..f6fdcfb9 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -642,9 +642,7 @@
   
   !insertmacro MUI_INTERFACE
   !insertmacro MUI_BASIC
-  !ifdef MUI_UNINSTALLER
-	!insertmacro MUI_UNBASIC
-  !endif
+  !insertmacro MUI_UNBASIC
   
   !verbose 4
   
@@ -666,10 +664,14 @@
 !macro MUI_UNBASIC
 
   !verbose 3
+  
+  !ifdef MUI_UNINSTALLER
 
-  !insertmacro MUI_UNPAGECOMMANDS
-  !insertmacro MUI_UNFUNCTIONS_PAGES
-  !insertmacro MUI_UNFUNCTIONS_GUIINIT
+    !insertmacro MUI_UNPAGECOMMANDS
+    !insertmacro MUI_UNFUNCTIONS_PAGES
+    !insertmacro MUI_UNFUNCTIONS_GUIINIT
+  
+  !endif
 
   !verbose 4