diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 1c945a5a..acd8656b 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -924,8 +924,8 @@ function searchButtonPress(){
 
 $(document).ready(function(){
 
-  <?php if($this->input->post('callsign') != "") { ?>
-        $('#partial_view').load("logbook/search_result/<?php echo str_replace("Ø","0",$this->input->post('callsign')); ?>", function() {
+  <?php if($this->input->post('searchBar') != "") { ?>
+        $('#partial_view').load("logbook/search_result/<?php echo str_replace("Ø","0",$this->input->post('searchBar')); ?>", function() {
            $('[data-toggle="tooltip"]').tooltip()
     });
   <?php } ?>
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index eaf61e65..a89ce6b2 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -237,14 +237,16 @@
 							if (action === 'search') {
 								form.action = "<?php echo site_url('search'); ?>";
 								form.method = "post";
-							} else if (action === 'qso') {
-								form.action = "<?php echo site_url('qso'); ?>";
-								form.method = "get";
-								input.name = "manual";
-								input.value = "0";  // Set to 1 if go to "Post-QSO" logging
 							}
 							form.submit();
 						}
+						function logQuicklog() {
+							if (localStorage.getItem("quicklogCallsign") !== "") {
+  								localStorage.removeItem("quicklogCallsign");
+							}
+							localStorage.setItem("quicklogCallsign", $("input[name='searchBar']").val());
+							window.open("<?php echo site_url('qso?manual=0'); ?>", "_self");
+						}
 					</script>
 					<?php if ($this->session->userdata('user_quicklog_enter')  == 1) { ?>
 						<script>
@@ -258,18 +260,17 @@
 						<script>
 							function handleKeyPress(event) {
 								if (event.key === 'Enter') {
-									submitForm('qso'); // Treat Enter key press as clicking the 'quicksearch-log' button
+									logQuicklog(); // Treat Enter key press as clicking the 'quicksearch-log' button
 								}
 							}
 						</script>
 					<?php } ?>
-					<form id="quicklog-form" class="form-inline">
-						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text_quicklog'); ?>" aria-label="Search" onkeypress="handleKeyPress(event)">
+					<form id="quicklog-form" class="form-inline" onsubmit="return false;">
+						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="text" name="searchBar" placeholder="<?php echo lang('menu_search_text_quicklog'); ?>" aria-label="Quicklog" onkeypress="handleKeyPress(event)">
 
-						<button title="<?php echo lang('menu_search_button_qicksearch_log'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="button" onclick="submitForm('qso')"><i class="fas fa-plus"></i>
+						<button title="<?php echo lang('menu_search_button_qicksearch_log'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="button" onclick="logQuicklog()"><i class="fas fa-plus"></i>
 							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button_qicksearch_log'); ?></div>
 						</button>
-						<input type="hidden" id="quicklog-input">
 
 						<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="button" onclick="submitForm('search')" style="margin-left: 5px"><i class="fas fa-search"></i>
 							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
@@ -277,7 +278,7 @@
 					</form>
 				<?php } else { ?>
 					<form method="post" action="<?php echo site_url('search'); ?>" class="form-inline">
-						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
+						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="searchBar" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
 						<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
 							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
 						</button>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index bcbe8fd1..3222af4b 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -109,7 +109,7 @@
               <div class="form-row">
                 <div class="form-group col-md-9">
                   <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label><?php if ($this->optionslib->get_option('dxcache_url') != '') { ?>&nbsp;<i id="check_cluster" data-toggle="tooltip" data-original-title="Search DXCluster for latest Spot" class="fas fa-search"></i> <?php } ?>
-                  <input type="text" class="form-control" id="callsign" name="callsign" value="<?php echo !empty($_GET['callsign']) ? $_GET['callsign'] : ''; ?>" required>
+                  <input type="text" class="form-control" id="callsign" name="callsign" required>
                   <small id="callsign_info" class="badge badge-secondary"></small> <a id="lotw_link"><small id="lotw_info" class="badge badge-success"></small></a>
                 </div>
                 <div class="form-group col-md-3 align-self-center">
diff --git a/application/views/search/main.php b/application/views/search/main.php
index 78d36a6c..baccd5c2 100644
--- a/application/views/search/main.php
+++ b/application/views/search/main.php
@@ -30,7 +30,7 @@
 		  <div class="form-group row">
 		    <label for="callsign" class="col-sm-2 col-form-label">Callsign / Gridsquare</label>
 		    <div class="col-sm-8">
-		      <input type="text" class="form-control" id="callsign" value="<?php if ($this->input->post('callsign') !== null) { echo htmlspecialchars($this->input->post('callsign')); }; ?>">
+		      <input type="text" class="form-control" id="callsign" value="<?php if ($this->input->post('searchBar') !== null) { echo htmlspecialchars($this->input->post('searchBar')); }; ?>">
 		    </div>
 		    <div class="col-sm-2">
 		    	<button onclick="searchButtonPress()" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 6fb67264..a1146772 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1,5 +1,12 @@
 $( document ).ready(function() {
-
+	setTimeout(function() {
+		var callsignValue = localStorage.getItem("quicklogCallsign");
+		if (callsignValue !== "") {
+		  $("#callsign").val(callsignValue);
+		  $("#mode").focus();
+		  localStorage.removeItem("quicklogCallsign");
+		}
+	  }, 100);
 var favs={};
 	get_fav();