diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index a4bec87..d52d8af 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -72,7 +72,7 @@ module TabHelper
       return "active" if current_page?(controller: "projects", action: action, id: @project)
     end
 
-    if ['snippets', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
+    if ['snippets', 'services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
      "active"
     end
   end
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 81599ec..ae3dbef 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -9,7 +9,7 @@
         GitLab CI
         %small Continuous integration server from GitLab
       .right
-        - if @gitlab_ci_service.active
+        - if @gitlab_ci_service.try(:active)
           %small.cgreen Enabled
         - else
           %small.cgray Disabled
--
libgit2 0.21.2