diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c5fa265a..b18eb99c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -388,7 +388,9 @@ module ApplicationHelper
end
def page_header_title
- if @project.nil? || @project.new_record?
+ if @page_header_title.present?
+ h(@page_header_title)
+ elsif @project.nil? || @project.new_record?
h(Setting.app_title)
else
b = []
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index f7e72313..3015907a 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -1,5 +1,3 @@
-
<%=l(:label_administration)%>
-
<%= render :partial => 'no_data' if @no_configuration_data %>
<%= render :partial => 'menu' %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 197c32a8..93d35bf0 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -1,8 +1,6 @@
-<% unless controller_name == 'admin' && action_name == 'index' %>
- <% content_for :sidebar do %>
-
<%=l(:label_administration)%>
- <%= render :partial => 'admin/menu' %>
- <% end %>
+<% @page_header_title = l(:label_administration) %>
+<% content_for :sidebar do %>
+ <%= render :partial => 'admin/menu' %>
<% end %>
<%= render :file => "layouts/base" %>