diff --git a/templates/Includes/ModelAdmin_left.ss b/templates/Includes/ModelAdmin_left.ss
index f5cc52b4..c73d0f88 100755
--- a/templates/Includes/ModelAdmin_left.ss
+++ b/templates/Includes/ModelAdmin_left.ss
@@ -2,7 +2,7 @@
 	<% if SearchClassSelector = tabs %>
 		<ul>
 			<% control ModelForms %>
-				<li class="$FirstLast"><a href="#{$Form.Name}_$ClassName">$Title</a></li>
+				 <li class="$FirstLast"><a id="tab-ModelAdmin_$Title.HTMLATT" href="#{$Form.Name}_$ClassName">$Title</a></li>
 			<% end_control %>
 		</ul>
 	<% end_if %>
diff --git a/tests/salad/step_definitions/general.rb b/tests/salad/step_definitions/general.rb
index 487769fc..994689bf 100644
--- a/tests/salad/step_definitions/general.rb
+++ b/tests/salad/step_definitions/general.rb
@@ -2,8 +2,23 @@
 ## General rules for the SilverStripe CMS as a whole.  They mostly have to do with the LeftAndMain
 ## interface
 
+# Match general CMS tabs, ModelAdmin needs another system
 Given /I click on the "([^\"]*)" tab/ do |tab|
-  Given "I click the \"tab-Root_Content_set_#{tab}\" link"
+	found = nil
+	links = @salad.browser.links()
+	links.each {|link|
+		if /^tab-.+/.match(link.id) then
+			if link.innerText == tab or /^tab-.*#{tab}(_set)?/.match(link.id) then
+				found = link
+				break
+			end
+		end
+	}
+	if found then
+		Given "I click the \"#{found.id}\" link"
+	else
+		fail("Could not find the \"#{tab}\" tab")
+	end
 end
 
 Given /I wait for a status message/ do