diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb
index 535933d..5fabbab 100644
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@@ -293,7 +293,7 @@ module RemoteStorage
     end
 
     def url_for_key(user, directory, key)
-      "#{container_url_for(user)}/#{escape(directory)}/#{escape(key)}"
+      File.join [container_url_for(user), escape(directory), escape(key)].compact
     end
 
     def url_for_directory(user, directory)