diff --git a/lib/draper.rb b/lib/draper.rb
index b25a2a7..351a81c 100644
--- a/lib/draper.rb
+++ b/lib/draper.rb
@@ -33,10 +33,7 @@ module Draper
       extend  Draper::HelperSupport
       extend  Draper::DecoratesAssigned
 
-      before_filter do |controller|
-        Draper::ViewContext.clear!
-        Draper::ViewContext.controller = controller
-      end
+      before_filter :activate_draper
     end
   end
 
diff --git a/lib/draper/view_context.rb b/lib/draper/view_context.rb
index b49b22d..7f5007f 100755
--- a/lib/draper/view_context.rb
+++ b/lib/draper/view_context.rb
@@ -10,6 +10,11 @@ module Draper
       end
     end
 
+    # Set the current controller
+    def activate_draper
+      Draper::ViewContext.controller = self
+    end
+
     # Returns the current controller.
     def self.controller
       RequestStore.store[:current_controller]