diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 29e7418e..1caffc40 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -145,7 +145,7 @@ sub submit : Chained('jobset') PathPart Args(0) {
     });
 
     $c->res->redirect($c->uri_for($self->action_for("index"),
-        [$c->stash->{project}->name, $c->stash->{jobset}->name]));
+        [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration");
 }
 
 
diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm
index 84516473..a43c9f9a 100644
--- a/src/lib/Hydra/Controller/Project.pm
+++ b/src/lib/Hydra/Controller/Project.pm
@@ -58,7 +58,7 @@ sub submit : Chained('project') PathPart Args(0) {
         updateProject($c, $c->stash->{project});
     });
 
-    $c->res->redirect($c->uri_for($self->action_for("view"), [$c->stash->{project}->name]));
+    $c->res->redirect($c->uri_for($self->action_for("view"), [$c->stash->{project}->name]) . "#tabs-configuration");
 }
 
 
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 4d81fd21..156ef5df 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -47,7 +47,7 @@
   [% END %]
   <li><a href="#tabs-status" data-toggle="tab">Job status</a></li>
   <li><a href="#tabs-jobs" data-toggle="tab">Jobs</a></li>
-  <li><a href="#tabs-setup" data-toggle="tab">Configuration</a></li>
+  <li><a href="#tabs-configuration" data-toggle="tab">Configuration</a></li>
 </ul>
 
 <div id="generic-tabs" class="tab-content">
@@ -100,7 +100,7 @@
     </div>
   [% END %]
 
-  <div id="tabs-setup" class="tab-pane">
+  <div id="tabs-configuration" class="tab-pane">
 
     <a class="btn pull-right" href="[% c.uri_for('/jobset' project.name jobset.name "edit") %]"><i class="icon-edit"></i> Edit</a>
 
diff --git a/src/root/project.tt b/src/root/project.tt
index bd6217c4..2e35ec8b 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -3,7 +3,7 @@
 
 <ul class="nav nav-tabs">
   <li class="active"><a href="#tabs-project" data-toggle="tab">Jobsets</a></li>
-  <li><a href="#tabs-settings" data-toggle="tab">Configuration</a></li>
+  <li><a href="#tabs-configuration" data-toggle="tab">Configuration</a></li>
   <li><a href="#tabs-releases" data-toggle="tab">Releases</a></li>
   <li><a href="#tabs-views" data-toggle="tab">Views</a></li>
 </ul>
@@ -77,7 +77,7 @@
 
   </div>
 
-  <div id="tabs-settings" class="tab-pane">
+  <div id="tabs-configuration" class="tab-pane">
     <a class="btn pull-right" href="[% c.uri_for('/project' project.name "edit") %]"><i class="icon-edit"></i> Edit</a>
     <table class="info-table">
       <tr>