diff --git a/lib/fleakr/objects/set.rb b/lib/fleakr/objects/set.rb
index dfbea41..75e6698 100644
--- a/lib/fleakr/objects/set.rb
+++ b/lib/fleakr/objects/set.rb
@@ -52,7 +52,7 @@ def file_prefix(index) # :nodoc:
       end
 
       def folder_name # :nodoc:
-        title.gsub("/", '')
+        title.gsub("/", ' ').squeeze(' ')
       end
 
       # Primary photo for this set. See Fleakr::Objects::Photo for more details.
diff --git a/test/unit/fleakr/objects/set_test.rb b/test/unit/fleakr/objects/set_test.rb
index fd69edd..c497318 100644
--- a/test/unit/fleakr/objects/set_test.rb
+++ b/test/unit/fleakr/objects/set_test.rb
@@ -90,7 +90,14 @@ class SetTest < Test::Unit::TestCase
         set = Set.new
         set.stubs(:title).with().returns("This/That")
 
-        set.folder_name.should == 'ThisThat'
+        set.folder_name.should == 'This That'
+      end
+
+      should "collapse spaces when generating the folder name" do
+        set = Set.new
+        set.stubs(:title).with().returns('This / That')
+
+        set.folder_name.should == 'This That'
       end
 
       context "when saving the set" do