diff --git a/app/components/orgs-filter.coffee b/app/components/orgs-filter.coffee
index 53f39177..037e4c64 100644
--- a/app/components/orgs-filter.coffee
+++ b/app/components/orgs-filter.coffee
@@ -2,9 +2,12 @@
 
 Component = Ember.Component.extend
 
-  actions: {
+  actions:
+    toggleOrgFilter: () ->
+      @toggleProperty('showFilter')
+      false
     select: (org) ->
+      @toggleProperty('showFilter')
       @sendAction('action', org)
-  }
 
 `export default Component`
diff --git a/app/controllers/dashboard/repositories.coffee b/app/controllers/dashboard/repositories.coffee
index cdeae39b..0f06dbe6 100644
--- a/app/controllers/dashboard/repositories.coffee
+++ b/app/controllers/dashboard/repositories.coffee
@@ -12,7 +12,8 @@ Controller = Ember.Controller.extend
     org = @get('org')
  
     repos = repos.filter (item, index) ->
-      item.get('default_branch.last_build') != null
+      if item.get('default_branch')
+        item.get('default_branch.last_build') != null
     .sortBy('default_branch.last_build.finished_at')
     .reverse()
 
diff --git a/app/routes/dashboard/repositories.coffee b/app/routes/dashboard/repositories.coffee
index 93976fd5..36ec9c4a 100644
--- a/app/routes/dashboard/repositories.coffee
+++ b/app/routes/dashboard/repositories.coffee
@@ -7,22 +7,16 @@ Route = TravisRoute.extend
     filter: { replace: true }
   model: ->
     apiEndpoint = config.apiEndpoint
-    $.ajax(apiEndpoint + '/v3/repos?repository.active=true&include=build.commit', {
+    $.ajax(apiEndpoint + '/v3/repos?repository.active=true&include=repository.default_branch,build.commit', {
       headers: {
         Authorization: 'token ' + @auth.token()
       }
     }).then (response) ->
-      response.repositories.sortBy('last_build.finished_at').filter( (repo) ->
-        repo.last_build
-      ).sort( (a, b) ->
-        if !a.last_build.finished_at || a.last_build.finished_at > b.last_build.finished_at
-          return -1
-        else if !b.last_build.finished_at || b.last_build.finished_at > a.last_build.finished_at
-          return 1
-        else
-          return 0
+      response.repositories.filter( (repo) ->
+        if repo.default_branch
+          repo.default_branch.last_build
       ).map( (repo) ->
         Ember.Object.create(repo)
-      )
+      ).sortBy('default_branch.last_build.finished_at')
 
 `export default Route`
diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass
index ee34d863..6afc0633 100644
--- a/app/styles/app/modules/dropdown.sass
+++ b/app/styles/app/modules/dropdown.sass
@@ -83,9 +83,8 @@ $dropdown-border: #C3D9DB
     a
       font-weight: 600
 
-.filter-current:hover ~ .filter-dropdown,
-.filter-dropdown:hover
-  display: block
+  &.is-open
+    display: block
 
 
 
diff --git a/app/templates/components/dashboard-row.hbs b/app/templates/components/dashboard-row.hbs
index 035f9d26..c26b3e7a 100644
--- a/app/templates/components/dashboard-row.hbs
+++ b/app/templates/components/dashboard-row.hbs
@@ -9,7 +9,7 @@
 <div class="one-line fade-out">
   <div class="row-request">
     <div class="row-item">
-    {{#link-to "build" repo.owner.login repo.name repo.last_build.id}}
+    {{#link-to "build" repo.owner.login repo.name repo.default_branch.last_build.id}}
       {{request-icon build=repo.default_branch.last_build}}
       <span class="label-align">#{{repo.default_branch.last_build.number}} {{repo.default_branch.last_build.state}} on {{repo.default_branch.name}}</span>
     {{/link-to}}
diff --git a/app/templates/components/orgs-filter.hbs b/app/templates/components/orgs-filter.hbs
index 5323e841..b929ac85 100644
--- a/app/templates/components/orgs-filter.hbs
+++ b/app/templates/components/orgs-filter.hbs
@@ -3,7 +3,7 @@
     {{#if orgs.isLoading}}
       {{loading-indicator}}
     {{else}}
-      <a href="" title="">
+      <a {{action 'toggleOrgFilter'}} title="">
         {{#if selected }}
           <img src="{{selected.avatar_url}}" alt="{{org.login}}">
           {{#if selected.name}}
@@ -17,7 +17,7 @@
       </a><span class="icon-arrow-down"></span>
     {{/if}}
   </div>
-  <ul class="filter-dropdown">
+  <ul class="filter-dropdown {{if showFilter 'is-open'}}">
     {{#if selected }}
       <li><a title="" {{action 'select'}}>All organizations</a></li>
     {{/if}}
diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs
index 24f7008a..5285f34f 100644
--- a/app/templates/dashboard/repositories.hbs
+++ b/app/templates/dashboard/repositories.hbs
@@ -19,6 +19,8 @@
   <ul class="dashboard-active">
     {{#each repo in filteredRepositories}}
       {{dashboard-row repo=repo}}
+    {{else}}
+      {{no-repos}}
     {{/each}}
   </ul>
   {{!-- <hr> --}}