diff --git a/app/controllers/concerns/flag_actions.rb b/app/controllers/concerns/flag_actions.rb
index 3f5d0b2c7..da637407a 100644
--- a/app/controllers/concerns/flag_actions.rb
+++ b/app/controllers/concerns/flag_actions.rb
@@ -3,18 +3,32 @@ module FlagActions
 
   def flag
     Flag.flag(current_user, flaggable)
-    respond_with flaggable, template: "#{controller_name}/_refresh_flag_actions"
+
+    if controller_name == 'investments'
+      respond_with flaggable, template: "budgets/#{controller_name}/_refresh_flag_actions"
+    else
+      respond_with flaggable, template: "#{controller_name}/_refresh_flag_actions"
+    end
   end
 
   def unflag
     Flag.unflag(current_user, flaggable)
-    respond_with flaggable, template: "#{controller_name}/_refresh_flag_actions"
+
+    if controller_name == 'investments'
+      respond_with flaggable, template: "budgets/#{controller_name}/_refresh_flag_actions"
+    else
+      respond_with flaggable, template: "#{controller_name}/_refresh_flag_actions"
+    end
   end
 
   private
 
     def flaggable
-      instance_variable_get("@#{resource_model.to_s.downcase}")
+      if resource_model.to_s == 'Budget::Investment'
+        instance_variable_get("@investment")
+      else
+        instance_variable_get("@#{resource_model.to_s.downcase}")
+      end
     end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
index 6a9b95cd4..292200f6a 100644
--- a/app/models/budget/investment.rb
+++ b/app/models/budget/investment.rb
@@ -23,6 +23,7 @@ class Budget
     include Relationable
     include Notifiable
     include Filterable
+    include Flaggable
 
     belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
     belongs_to :heading
diff --git a/app/models/user.rb b/app/models/user.rb
index 67fe5d104..4b999207d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -182,6 +182,7 @@ class User < ActiveRecord::Base
     debates_ids = Debate.where(author_id: id).pluck(:id)
     comments_ids = Comment.where(user_id: id).pluck(:id)
     proposal_ids = Proposal.where(author_id: id).pluck(:id)
+    investment_ids = Budget::Investment.where(author_id: id).pluck(:id)
     proposal_notification_ids = ProposalNotification.where(author_id: id).pluck(:id)
 
     hide
@@ -189,6 +190,7 @@ class User < ActiveRecord::Base
     Debate.hide_all debates_ids
     Comment.hide_all comments_ids
     Proposal.hide_all proposal_ids
+    Budget::Investment.hide_all investment_ids
     ProposalNotification.hide_all proposal_notification_ids
   end