diff --git a/lib/draper/view_context.rb b/lib/draper/view_context.rb
index 02d0ac3..7f5007f 100755
--- a/lib/draper/view_context.rb
+++ b/lib/draper/view_context.rb
@@ -12,7 +12,7 @@ module Draper
 
     # Set the current controller
     def activate_draper
-      Draper::ViewContext.controller = controller
+      Draper::ViewContext.controller = self
     end
 
     # Returns the current controller.