diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb
index 66aee5a01..c7610eba9 100644
--- a/app/controllers/management/base_controller.rb
+++ b/app/controllers/management/base_controller.rb
@@ -5,6 +5,7 @@ class Management::BaseController < ActionController::Base
   before_action :set_locale
 
   helper_method :managed_user
+  helper_method :current_user
 
   private
 
@@ -40,4 +41,7 @@ class Management::BaseController < ActionController::Base
       I18n.locale = session[:locale]
     end
 
+    def current_budget
+      Budget.current
+    end
 end
diff --git a/app/controllers/management/budgets_controller.rb b/app/controllers/management/budgets_controller.rb
index 470d1f9fd..b83d843e2 100644
--- a/app/controllers/management/budgets_controller.rb
+++ b/app/controllers/management/budgets_controller.rb
@@ -19,7 +19,7 @@ class Management::BudgetsController < Management::BaseController
   end
 
   def print_investments
-    @budget = Budget.current
+    @budget = current_budget
   end
 
   private
diff --git a/app/controllers/valuation/budgets_controller.rb b/app/controllers/valuation/budgets_controller.rb
index cf99f95e3..9789ab929 100644
--- a/app/controllers/valuation/budgets_controller.rb
+++ b/app/controllers/valuation/budgets_controller.rb
@@ -5,7 +5,7 @@ class Valuation::BudgetsController < Valuation::BaseController
   load_and_authorize_resource
 
   def index
-    @budget = Budget.current
+    @budget = current_budget
     if @budget.present?
       @investments_with_valuation_open = {}
       @investments_with_valuation_open = @budget.investments
diff --git a/app/models/budget.rb b/app/models/budget.rb
index ceaffb19a..2e4af0000 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -33,7 +33,7 @@ class Budget < ActiveRecord::Base
   scope :open, -> { where.not(phase: "finished") }
 
   def self.current
-    where.not(phase: "drafting").last
+    where.not(phase: "drafting").order(:created_at).last
   end
 
   def current_phase