diff --git a/app/views/box_organizer/index.rhtml b/app/views/box_organizer/index.rhtml
index 93b0161..940eaa0 100644
--- a/app/views/box_organizer/index.rhtml
+++ b/app/views/box_organizer/index.rhtml
@@ -2,4 +2,5 @@
 
 <% button_bar do %>
   <%= lightbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
+  <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
 <% end %>
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index 750ddff..1f1d4cb 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -236,5 +236,10 @@ class ProfileDesignControllerTest < Test::Unit::TestCase
 
   end
 
+  should 'display back to control panel button' do
+    get :index, :profile => 'designtestuser'
+    assert_tag :tag => 'a', :content => 'Back to control panel'
+  end
+ 
 end
 
--
libgit2 0.21.2