diff --git a/app/views/settings/_blocks.haml b/app/views/settings/blocks/index.haml
similarity index 94%
rename from app/views/settings/_blocks.haml
rename to app/views/settings/blocks/index.haml
index 5592a372..895f44ee 100644
--- a/app/views/settings/_blocks.haml
+++ b/app/views/settings/blocks/index.haml
@@ -33,3 +33,6 @@
 
       - if @anonymous_blocks.empty?
         %p.text-muted.text-center= t(".none")
+
+- provide(:title, generate_title(t(".title")))
+- parent_layout "user/settings"
diff --git a/app/views/tabs/_settings.haml b/app/views/tabs/_settings.haml
index 80ccafaa..20c52307 100644
--- a/app/views/tabs/_settings.haml
+++ b/app/views/tabs/_settings.haml
@@ -6,7 +6,7 @@
     = list_group_item t(".security"), settings_two_factor_authentication_otp_authentication_path
     = list_group_item t(".sharing"), services_path
     = list_group_item t(".mutes"), settings_muted_path
-    = list_group_item t(".blocks"), edit_user_blocks_path
+    = list_group_item t(".blocks"), settings_blocks_path
     = list_group_item t(".theme"), settings_theme_path
     = list_group_item t(".data"), user_data_path
     = list_group_item t(".export"), settings_export_path
diff --git a/app/views/user/edit_blocks.haml b/app/views/user/edit_blocks.haml
deleted file mode 100644
index c0541f5b..00000000
--- a/app/views/user/edit_blocks.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-= render "settings/blocks"
-
-- provide(:title, generate_title(t(".title")))
-- parent_layout "user/settings"
\ No newline at end of file