diff --git a/layouts/shortcodes/yasgui-query.html b/layouts/shortcodes/yasgui-query.html
index 4d65789..5eaa37b 100644
--- a/layouts/shortcodes/yasgui-query.html
+++ b/layouts/shortcodes/yasgui-query.html
@@ -2,6 +2,6 @@
 
 {{ highlight $q "sparql" }}
 <a class="book-btn"
-   onclick="setYasguiQuery('{{ .Get "yasgui-id" }}', '{{ .Get "title" }}', '{{ $q }}'); location.href='#{{ .Get "yasgui-id" }}'">
+   onclick="setYasguiQuery('{{ .Get "yasgui-id" }}', '{{ .Get "title" }}', '{{ $q }}'); location.href='#yasgui-{{ .Get "yasgui-id" }}'">
     ▶ 実行する
 </a>
\ No newline at end of file
diff --git a/layouts/shortcodes/yasgui.html b/layouts/shortcodes/yasgui.html
index 668f8a8..e23e811 100644
--- a/layouts/shortcodes/yasgui.html
+++ b/layouts/shortcodes/yasgui.html
@@ -11,6 +11,7 @@
   yasgui["{{ .Get "id" }}"] = new Yasgui(document.getElementById("yasgui-{{ .Get "id" }}"), {
     requestConfig: {{ dict "endpoint" (.Get "endpoint") }},
     persistenceId: "{{ .Get "id" }}",
+    autofocus: false,
     copyEndpointOnNewTab: false,
     yasqe: {
       theme: "{{ .Site.Params.CodeMirrorTheme }}",