diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index b73c1c1..540a73e 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -7,4 +7,8 @@ module DashboardHelper
       dashboard_merge_requests_path(options)
     end
   end
+
+  def entities_per_project project, entity
+    project.items_for(entity).where(assignee_id: current_user.id).count
+  end
 end
diff --git a/app/views/dashboard/_filter.html.haml b/app/views/dashboard/_filter.html.haml
index 98961b3..fc00ca7 100644
--- a/app/views/dashboard/_filter.html.haml
+++ b/app/views/dashboard/_filter.html.haml
@@ -21,10 +21,11 @@
     %legend Projects:
     %ul.nav.nav-pills.nav-stacked
       - @projects.each do |project|
-        %li{class: ("active" if params[:project_id] == project.id.to_s)}
-          = link_to dashboard_filter_path(entity, project_id: project.id) do
-            = project.name_with_namespace
-            %small.right= project.items_for(entity).where(assignee_id: current_user.id).count
+        - unless entities_per_project(project, entity).zero?
+          %li{class: ("active" if params[:project_id] == project.id.to_s)}
+            = link_to dashboard_filter_path(entity, project_id: project.id) do
+              = project.name_with_namespace
+              %small.right= entities_per_project(project, entity)
 
   %fieldset
     %hr
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index 28b6f53..91c83d8 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@@ -41,11 +41,11 @@ module Gitlab
       end
 
       def lock_file
-        Rails.root.join("tmp", "#{project.path}.lock")
+        Rails.root.join("tmp", "satellite_#{project.id}.lock")
       end
 
       def path
-        Rails.root.join("tmp", "repo_satellites", project.path)
+        Rails.root.join("tmp", "repo_satellites", project.path_with_namespace)
       end
 
       def repo
--
libgit2 0.21.2