diff --git a/app/views/buckets/edit.html.erb b/app/views/buckets/edit.html.erb
index f5c2dab81..2b4814a2f 100644
--- a/app/views/buckets/edit.html.erb
+++ b/app/views/buckets/edit.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <nav>
-    <%= link_to buckets_path, class: "btn flex-item-justify-start" do %>
+    <%= link_to buckets_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
       <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
diff --git a/app/views/buckets/new.html.erb b/app/views/buckets/new.html.erb
index 49b0b9ef0..0483796d6 100644
--- a/app/views/buckets/new.html.erb
+++ b/app/views/buckets/new.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <nav>
-    <%= link_to buckets_path, class: "btn flex-item-justify-start" do %>
+    <%= link_to buckets_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
       <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
       <span class="for-screen-reader">Go back</span>
     <% end %>