diff --git a/src/js/main.js b/src/js/main.js
index 291d0da0aa50f75e5458e28f72c0a814625953e9..6a9cb78fb94b197bb99f0efe93c776ff73476edf 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -94,18 +94,19 @@ export async function checkinItems() {
   }
 }
 
-export async function loadStorages() {
+export async function loadStorages(selectedStorage) {
   await getConfig();
   var response = await fetch(config.backend_url + "/storages");
   var storages = await response.json();
   var select = document.querySelector("#storage_select");
   for (var i in storages) {
-    console.log(storages[i]);
     var option = document.createElement("option");
     option.textContent = storages[i].name;
     option.value = storages[i].name;
     select.appendChild(option);
-
+    if (selectedStorage == storages[i].name) {
+      select.value = selectedStorage;
+    }
   }
 }
 
diff --git a/src/views/checkin.html b/src/views/checkin.html
index 495378f20ee6e266828dcd3edeef55697c2af971..c2f8bb60263a94f9c5a9ef59696be1a2d3ed8a0b 100644
--- a/src/views/checkin.html
+++ b/src/views/checkin.html
@@ -9,17 +9,17 @@
     <div class="container">
       <h1>Checkin</h1>
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-4">
+          <select class="form-control" id="storage_select"></select>
+          <button onclick="lib.scanStorage()" class="btn btn-primary">Scan Storage</button>
+          <div id="storage"></div>
+        </div>
+        <div class="col-md-4">
           <input class="form-control" type="text" placeholder="tag" onchange="lib.addItemTag(this,event)">
           <button onclick="lib.scanItem()" class="btn btn-primary">Scan Item</button>
           <ul id="items">
           </ul>
         </div>
-        <div class="col-md-6">
-          <select class="form-control" id="storage_select"></select>
-          <button onclick="lib.scanStorage()" class="btn btn-primary">Scan Storage</button>
-          <div id="storage"></div>
-        </div>
       </div>
       <div class="row">
         <div id="reader" style="width: 500px; margin 0 auto;"></div>
@@ -29,6 +29,6 @@
       </div>
     </div>
     <module href="/components/foot.html"></module>
-    <script>window.onload = function () { lib.loadStorages() };</script>
+    <script>window.onload = function () { lib.loadStorages(document.location.search.substring(1)) };</script>
   </body>
 </html>