diff --git a/assets/scripts/app/controllers/repo.coffee b/assets/scripts/app/controllers/repo.coffee
index 53fa703a..c4a796e4 100644
--- a/assets/scripts/app/controllers/repo.coffee
+++ b/assets/scripts/app/controllers/repo.coffee
@@ -57,7 +57,7 @@ Travis.RepoController = Travis.Controller.extend
     @connectTab('request')
 
   viewSettings: ->
-    @connectTab('request')
+    @connectTab('settings')
 
   lastBuildDidChange: ->
     Ember.run.scheduleOnce('data', this, @_lastBuildDidChange);
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 2b87667e..4e84decf 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -341,21 +341,9 @@ Travis.AuthRoute = Travis.Route.extend
       @transitionTo('index.current')
       return true
 
-Travis.RepoSettingsRoute = Travis.Route.extend
+Travis.SettingsRoute = Travis.Route.extend
   setupController: (controller, model) ->
-    # TODO: if repo is just a data hash with id and slug load it
-    #       as incomplete record
-    model = Travis.Repo.find(model.id) if model && !model.get
-    @_super(controller, model)
-
-  serialize: (repo) ->
-    slug = if repo.get then repo.get('slug') else repo.slug
-    [owner, name] = slug.split('/')
-    { owner: owner, name: name }
-
-  model: (params) ->
-    slug = "#{params.owner}/#{params.name}"
-    Travis.Repo.fetchBySlug(slug)
+    @controllerFor('repo').activate('settings')
 
 Travis.SettingsIndexRoute = Travis.Route.extend
   model: ->