diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/_form.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/_form.html.erb
index afa6b7e0eff0f..822ec9d414670 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/_form.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/_form.html.erb
@@ -4,20 +4,20 @@
       <%= form.text_field :token, aria: { label: :token }, class: "form-input" %>
     </div>
     <div class="row column">
-      <div class="flex items-center space-x-4">
-        <div class="flex items-center">
-          <%= form.radio_button :no_expiration, true, id: "expires_never", checked: form.object.no_expiration %>
-          <%= form.label :no_expiration, "Never expire", for: "expires_never" %>
+      <%= t("share_tokens.form.expires_at", scope: "decidim.admin") %>
+    </div>
+    <div class="row column -mt-4">
+      <div class="ml-2">
+        <div class="mr-4">
+          <%= form.radio_button :no_expiration, t("share_tokens.form.never_expire", scope: "decidim.admin"), checked: form.object.no_expiration %>
         </div>
+
+        <%= form.radio_button :no_expiration, t("share_tokens.form.custom", scope: "decidim.admin"), checked: !form.object.no_expiration %>
         
-        <div class="flex items-center">
-          <%= form.radio_button :no_expiration, false, id: "expires_custom", checked: !form.object.no_expiration %>
-          <%= form.label :no_expiration, "Custom", for: "expires_custom" %>
+        <div id="expires_at_field_wrapper" class="<%= form.object.no_expiration ? "hidden" : "" %> mt-4 row column">
+          <%= form.datetime_field :expires_at, label: t("share_tokens.form.custom_expiration", scope: "decidim.admin") %>
         </div>
-      </div>
-      
-      <div id="expires_at_field_wrapper" class="<%= form.object.no_expiration ? "hidden" : "" %> mt-4">
-        <%= form.datetime_field :expires_at, aria: { label: :expires_at } %>
+
       </div>
     </div>
   </div>
@@ -25,12 +25,11 @@
 
 <script>
   document.addEventListener("DOMContentLoaded", () => {
-    const expiresNever = document.getElementById("expires_never");
-    const expiresCustom = document.getElementById("expires_custom");
+    const radioButtons = document.querySelectorAll("input[name='share_token[no_expiration]']");
     const expiresAtFieldWrapper = document.getElementById("expires_at_field_wrapper");
 
     const toggleExpiresAtField = () => {
-      if (expiresCustom.checked) {
+      if (radioButtons[1].checked) {
         expiresAtFieldWrapper.classList.remove("hidden");
       } else {
         expiresAtFieldWrapper.classList.add("hidden");
@@ -38,8 +37,9 @@
       }
     };
 
-    expiresNever.addEventListener("change", toggleExpiresAtField);
-    expiresCustom.addEventListener("change", toggleExpiresAtField);
+    radioButtons.forEach(radioButton => {
+      radioButton.addEventListener("change", toggleExpiresAtField);
+    });
 
     toggleExpiresAtField();
   });
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 4b36d4f21a2b6..8b6fff0cdd53b 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -964,6 +964,11 @@ en:
         destroy:
           error: There was a problem destroying the token.
           success: Token destroyed successfully.
+        form:
+          custom: Custom
+          custom_expiration: Custom expiration
+          expires_at: Expires at
+          never_expire: Never
         index:
           back_to_share_tokens: Back to share tokens
           new_share_token_button: New token