diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 10f2e12..7ed1331 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -5,6 +5,8 @@ class SearchController < ApplicationController
   before_filter :require_account!
 
   def index
-    @search = Search.new(params[:search].fetch(:query, nil))
+    @search = Search.new(
+      scope: current_account.ideas, 
+      query: params[:search].fetch(:query, nil))
   end
 end
diff --git a/app/models/search.rb b/app/models/search.rb
index d859bdf..299662e 100644
--- a/app/models/search.rb
+++ b/app/models/search.rb
@@ -2,13 +2,14 @@ class Search
   include ActiveModel::Conversion
   extend ActiveModel::Naming
 
-  attr_accessor :query
+  attr_accessor :query, :scope
 
-  def initialize(query = nil)
+  def initialize(scope, query = nil)
+    @scope = scope || Idea
     @query = query
   end
 
   def ideas
-    Idea.basic_search(query)
+    scope.basic_search(query)
   end
 end
diff --git a/app/views/application/_search.html.haml b/app/views/application/_search.html.haml
index ac86c0e..0999b73 100644
--- a/app/views/application/_search.html.haml
+++ b/app/views/application/_search.html.haml
@@ -1,4 +1,6 @@
-= form_for(@search || Search.new, method: :get, html: { class: 'form-search' }) do |f|
-  .input-append
-    = f.text_field :query, class: 'input-medium search-query', placeholder: 'Search'
-    = f.submit 'Go', class: 'btn'
+- if current_account
+  - search = @search || Search.new(scope: current_account.ideas)
+  = form_for(search, method: :get, html: { class: 'form-search' }) do |f|
+    .input-append
+      = f.text_field :query, class: 'input-medium search-query', placeholder: 'Search'
+      = f.submit 'Go', class: 'btn'