diff --git a/static/view.js b/static/view.js
index 933e06f..6175445 100644
--- a/static/view.js
+++ b/static/view.js
@@ -7,11 +7,19 @@ window.addEventListener("message", receiveMessage, false);
 function receiveMessage(event) {
     app.resultPageHeight = event.data
 }
-searchbox = document.getElementById('searchbox')
+
+const searchbox = document.getElementById('searchbox')
 if (searchbox != null) {
     searchbox.onkeydown = function (event) {
         if (event.keyCode == 13) {
             searchTriggered()
         }
     }
-}
\ No newline at end of file
+}
+
+const urlParams = new URLSearchParams(window.location.search);
+const query = urlParams.get('q');
+if (query != null) {
+    searchbox.value = query
+    searchTriggered()
+}
diff --git a/website/view.js b/website/view.js
index 2140ff7..365c907 100644
--- a/website/view.js
+++ b/website/view.js
@@ -7,11 +7,19 @@ window.addEventListener("message", receiveMessage, false);
 function receiveMessage(event) {
     app.resultPageHeight = event.data
 }
-searchbox = document.getElementById('searchbox')
+
+const searchbox = document.getElementById('searchbox')
 if (searchbox != null) {
     searchbox.onkeydown = function (event) {
         if (event.keyCode == 13) {
             searchTriggered()
         }
     }
-}
\ No newline at end of file
+}
+
+const urlParams = new URLSearchParams(window.location.search);
+const query = urlParams.get('q');
+if (query != null) {
+    searchbox.value = query
+    searchTriggered()
+}