diff --git a/ShareX.Setup/InnoSetup/ShareX-setup.iss b/ShareX.Setup/InnoSetup/ShareX-setup.iss
index f2a9629f0..efcab266e 100644
--- a/ShareX.Setup/InnoSetup/ShareX-setup.iss
+++ b/ShareX.Setup/InnoSetup/ShareX-setup.iss
@@ -100,6 +100,8 @@ Root: "HKCU"; Subkey: "Software\Classes\Directory\shell\{#MyAppName}\command"; V
 Root: "HKCU"; Subkey: "Software\Classes\*\shell\{#MyAppName}"; Flags: dontcreatekey uninsdeletekey
 Root: "HKCU"; Subkey: "Software\Classes\Directory\shell\{#MyAppName}"; Flags: dontcreatekey uninsdeletekey
 Root: "HKCU"; Subkey: "Software\Classes\Folder\shell\{#MyAppName}"; Flags: dontcreatekey uninsdeletekey
+Root: "HKCU"; Subkey: "Software\Classes\.sxcu"; Flags: dontcreatekey uninsdeletekey
+Root: "HKCU"; Subkey: "Software\Classes\ShareX.sxcu"; Flags: dontcreatekey uninsdeletekey
 
 [Code]
 #include "Scripts\products.iss"
diff --git a/ShareX/IntegrationHelpers.cs b/ShareX/IntegrationHelpers.cs
index 96145cbd2..bfc89ea9e 100644
--- a/ShareX/IntegrationHelpers.cs
+++ b/ShareX/IntegrationHelpers.cs
@@ -117,6 +117,7 @@ public static void Uninstall()
         {
             CreateStartupShortcut(false);
             CreateShellContextMenuButton(false);
+            CreateCustomUploaderExtension(false);
             CreateSendToMenuButton(false);
         }
     }