diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb
index 06cd2f1..fdcd26b 100644
--- a/app/controllers/choices_controller.rb
+++ b/app/controllers/choices_controller.rb
@@ -16,7 +16,7 @@ class ChoicesController < InheritedResources::Base
 		      :order => 'score DESC', 
 		      :include => :item}
       
-      find_options[:conditions].merge!(:active => true) if params[:include_inactive]
+      find_options[:conditions].merge!(:active => true) unless params[:include_inactive]
       find_options.merge!(:offset => params[:offset]) if params[:offset]
 
       @choices = Choice.find(:all, find_options)
--
libgit2 0.21.2