diff --git a/app/components/valuation/budgets/index_component.html.erb b/app/components/valuation/budgets/index_component.html.erb
new file mode 100644
index 000000000..d4ecb28d5
--- /dev/null
+++ b/app/components/valuation/budgets/index_component.html.erb
@@ -0,0 +1,21 @@
+<h2 class="inline-block"><%= t("valuation.budgets.index.title") %></h2>
+
+<% if budget.present? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("valuation.budgets.index.table_name") %></th>
+        <th><%= t("valuation.budgets.index.table_phase") %></th>
+        <th><%= t("valuation.budgets.index.table_assigned_investments_valuation_open") %></th>
+        <th><%= t("valuation.budgets.index.table_actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render Valuation::Budgets::RowComponent.new(budget) %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary clear">
+    <%= t("valuation.budgets.index.no_budgets") %>
+  </div>
+<% end %>
diff --git a/app/components/valuation/budgets/index_component.rb b/app/components/valuation/budgets/index_component.rb
new file mode 100644
index 000000000..40138ac88
--- /dev/null
+++ b/app/components/valuation/budgets/index_component.rb
@@ -0,0 +1,7 @@
+class Valuation::Budgets::IndexComponent < ApplicationComponent
+  attr_reader :budget
+
+  def initialize(budget)
+    @budget = budget
+  end
+end
diff --git a/app/components/valuation/budgets/row_component.html.erb b/app/components/valuation/budgets/row_component.html.erb
new file mode 100644
index 000000000..be3fc52c5
--- /dev/null
+++ b/app/components/valuation/budgets/row_component.html.erb
@@ -0,0 +1,16 @@
+<tr id="<%= dom_id(budget) %>" class="budget">
+  <td>
+    <%= budget.name %>
+  </td>
+  <td>
+    <%= budget.current_phase.name %>
+  </td>
+  <td>
+    <%= investments_count %>
+  </td>
+  <td>
+    <%= link_to t("valuation.budgets.index.evaluate"),
+                valuation_budget_budget_investments_path(budget_id: budget.id),
+                class: "button hollow expanded" %>
+  </td>
+</tr>
diff --git a/app/components/valuation/budgets/row_component.rb b/app/components/valuation/budgets/row_component.rb
new file mode 100644
index 000000000..46fff464a
--- /dev/null
+++ b/app/components/valuation/budgets/row_component.rb
@@ -0,0 +1,13 @@
+class Valuation::Budgets::RowComponent < ApplicationComponent
+  attr_reader :budget
+
+  delegate :current_user, to: :helpers
+
+  def initialize(budget)
+    @budget = budget
+  end
+
+  def investments_count
+    budget.investments.by_valuator(current_user.valuator).valuation_open.count
+  end
+end
diff --git a/app/controllers/valuation/budgets_controller.rb b/app/controllers/valuation/budgets_controller.rb
index 0165fb0e2..a30ccc55e 100644
--- a/app/controllers/valuation/budgets_controller.rb
+++ b/app/controllers/valuation/budgets_controller.rb
@@ -6,8 +6,5 @@ class Valuation::BudgetsController < Valuation::BaseController
 
   def index
     @budget = current_budget
-    if @budget.present?
-      @investments = @budget.investments.by_valuator(current_user.valuator).valuation_open
-    end
   end
 end
diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb
index fae10257b..5f2db605c 100644
--- a/app/views/valuation/budgets/index.html.erb
+++ b/app/views/valuation/budgets/index.html.erb
@@ -1,36 +1 @@
-<h2 class="inline-block"><%= t("valuation.budgets.index.title") %></h2>
-
-<% if @budget.present? %>
-  <table>
-    <thead>
-      <tr>
-        <th><%= t("valuation.budgets.index.table_name") %></th>
-        <th><%= t("valuation.budgets.index.table_phase") %></th>
-        <th><%= t("valuation.budgets.index.table_assigned_investments_valuation_open") %></th>
-        <th><%= t("valuation.budgets.index.table_actions") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr id="<%= dom_id(@budget) %>" class="budget">
-        <td>
-          <%= @budget.name %>
-        </td>
-        <td>
-          <%= @budget.current_phase.name %>
-        </td>
-        <td>
-          <%= @investments.count %>
-        </td>
-        <td>
-          <%= link_to t("valuation.budgets.index.evaluate"),
-                      valuation_budget_budget_investments_path(budget_id: @budget.id),
-                      class: "button hollow expanded" %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-<% else %>
-  <div class="callout primary clear">
-    <%= t("valuation.budgets.index.no_budgets") %>
-  </div>
-<% end %>
+<%= render Valuation::Budgets::IndexComponent.new(@budget) %>