diff --git a/actions/block.php b/actions/block.php
index 5fae45dffc..fe4ec00881 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -168,4 +168,11 @@ class BlockAction extends ProfileFormAction
             return;
         }
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('form_action-yes');
+    }
+
 }
diff --git a/actions/groupblock.php b/actions/groupblock.php
index ec673358e6..88d7634a28 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -214,5 +214,12 @@ class GroupblockAction extends Action
                             303);
         }
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('form_action-yes');
+    }
+
 }