diff --git a/lib/carrierwave/support/uri_filename.rb b/lib/carrierwave/support/uri_filename.rb
index 9376800..91ddb9b 100644
--- a/lib/carrierwave/support/uri_filename.rb
+++ b/lib/carrierwave/support/uri_filename.rb
@@ -4,8 +4,8 @@ module UriFilename
       def self.filename(url)
         path = url.split('?').first
 
-        URI.decode(path).gsub(/.*\/(.*?$)/, '\1')
+        URI.decode_www_form_component(path).gsub(/.*\/(.*?$)/, '\1')
       end
     end
   end
-end
\ No newline at end of file
+end