diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in
index 9ef871107..ec1ffc255 100644
--- a/CMakeModules/NSIS.template.in
+++ b/CMakeModules/NSIS.template.in
@@ -548,7 +548,9 @@ Section Uninstall
    DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
    DeleteRegValue HKLM "Software\Tomahawk" ""
    DeleteRegKey HKLM "Software\Tomahawk"
-
+   
+   DeleteRegKey HKCR "Software\Tomahawk"
+   DeleteRegKey HKCR "Software\TomahawkSpotify"
    DeleteRegKey HKCR "tomahawk"
 
    ;Start menu shortcuts.