diff --git a/app/models/repo.coffee b/app/models/repo.coffee
index dcdb2613..1e30a8d8 100644
--- a/app/models/repo.coffee
+++ b/app/models/repo.coffee
@@ -149,7 +149,14 @@ Repo.reopenClass
     repos
 
   search: (store, query) ->
-    store.find('repo', search: query, orderBy: 'name')
+    promise = store.find('repo', search: query, orderBy: 'name')
+    result = Ember.ArrayProxy.create(content: [])
+
+    promise.then ->
+      result.pushObjects(promise.get('content').toArray())
+      result.set('isLoaded', true)
+
+    result
 
   withLastBuild: (store) ->
     repos = store.filter('repo', {}, (build) ->