diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index fe8f6f7..85c1d3d 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -143,7 +143,7 @@ module RemoteStorage
 
       sub_directories(user, directory).each do |entry|
         timestamp = DateTime.rfc2822(entry["last_modified"]).to_time.to_i
-        directory_name = entry["name"].split("/").last
+        directory_name = CGI.unescape(entry["name"]).split("/").last
         listing.merge!({ "#{directory_name}/" => timestamp })
       end