diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb
index 0d5b837d3..d8712a042 100644
--- a/app/views/settings/plugin.html.erb
+++ b/app/views/settings/plugin.html.erb
@@ -1,6 +1,6 @@
 <%= title [l(:label_plugins), {:controller => 'admin', :action => 'plugins'}], @plugin.name %>
 
-<div id="settings">
+<div id="settings" class="plugin plugin-<%= @plugin.id %>">
 <%= form_tag({:action => 'plugin'}) do %>
 <div class="box tabular settings">
 <%= render :partial => @partial, :locals => {:settings => @settings}%>
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index 12a6cef38..b9b4c971f 100644
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_test.rb
@@ -211,8 +211,10 @@ class SettingsControllerTest < Redmine::ControllerTest
     get :plugin, :params => {:id => 'foo'}
     assert_response :success
 
-    assert_select 'form[action="/settings/plugin/foo"]' do
-      assert_select 'input[name=?][value=?]', 'settings[sample_setting]', 'Plugin setting value'
+    assert_select '#settings.plugin.plugin-foo' do
+      assert_select 'form[action="/settings/plugin/foo"]' do
+        assert_select 'input[name=?][value=?]', 'settings[sample_setting]', 'Plugin setting value'
+      end
     end
   ensure
     Redmine::Plugin.unregister(:foo)