diff --git a/templates/nsis/installer.nsi b/templates/nsis/installer.nsi
index d431f3bf9e8..73af96095e4 100644
--- a/templates/nsis/installer.nsi
+++ b/templates/nsis/installer.nsi
@@ -52,10 +52,12 @@ Function un.onInit
   !insertmacro check64BitAndSetRegView
 
   ${IfNot} ${Silent}
-    MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK next
-      Quit
+    MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
+    Quit
 
-    next:
+    !ifdef ONE_CLICK
+      SetSilent silent
+    !endif
   ${EndIf}
 
   !insertmacro initMultiUser Un un.
diff --git a/templates/nsis/oneClick.nsh b/templates/nsis/oneClick.nsh
index 21754a4f9b4..387457595aa 100644
--- a/templates/nsis/oneClick.nsh
+++ b/templates/nsis/oneClick.nsh
@@ -9,7 +9,6 @@
   FunctionEnd
 !endif
 
-SilentUnInstall silent
 AutoCloseWindow true
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_UNPAGE_INSTFILES