diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index c6c95d2..55f9d6a 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -1,6 +1,6 @@
 class LinkListBlock < Block
 
-  attr_accessible :links
+  attr_accessible :links, :display
 
   ICONS = [
     ['no-icon', _('(No icon)')],
@@ -52,7 +52,7 @@ class LinkListBlock < Block
   def content(args={})
     block_title(title) +
     content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}
+      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join(',')
     )
   end
 
diff --git a/test/unit/link_list_block_test.rb b/test/unit/link_list_block_test.rb
index c7dca8a..ca3c0b0 100644
--- a/test/unit/link_list_block_test.rb
+++ b/test/unit/link_list_block_test.rb
@@ -77,7 +77,9 @@ class LinkListBlockTest < ActiveSupport::TestCase
   should 'be able to update display setting' do
     user = create_user('testinguser').person
     box = fast_create(Box, :owner_id => user.id)
-    block = LinkListBlock.create!(:display => 'never', :box => box)
+    block = LinkListBlock.new(:display => 'never').tap do |b|
+      b.box = box
+    end
     assert block.update_attributes!(:display => 'always')
     block.reload
     assert_equal 'always', block.display
--
libgit2 0.21.2