diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 8997bd031..841ac6514 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -523,8 +523,8 @@ $options = json_decode($options);
                     <?php if (($options->band->show ?? "true") == "true") {
                         echo '<th>' . lang('gen_hamradio_band') . '</th>';
                     } ?>
-                    <?php if (($options->myrefs->show ?? "true") == "true") {
-                        echo '<th>' . lang('gen_hamradio_myrefs') . '</th>';
+					<?php if (($options->gridsquare->show ?? "true") == "true") {
+                        echo '<th>Gridsquare</th>';
                     } ?>
                     <?php if (($options->name->show ?? "true") == "true") {
                         echo '<th>' . lang('general_word_name') . '</th>';
@@ -573,9 +573,6 @@ $options = json_decode($options);
                     } ?>
 					<?php if (($options->contest->show ?? "true") == "true") {
                         echo '<th>Contest</th>';
-                    } ?>
-					<?php if (($options->gridsquare->show ?? "true") == "true") {
-                        echo '<th>Gridsquare</th>';
                     } ?>
 					<?php if (($options->sota->show ?? "true") == "true") {
                         echo '<th>SOTA</th>';
@@ -588,6 +585,9 @@ $options = json_decode($options);
                     } ?>
 					<?php if (($options->sig->show ?? "true") == "true") {
                         echo '<th>SIG</th>';
+                    } ?>
+					<?php if (($options->myrefs->show ?? "true") == "true") {
+                        echo '<th>' . lang('gen_hamradio_myrefs') . '</th>';
                     } ?>
                 </tr>
             </thead>
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index b9636e42e..67bba3ed8 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -49,8 +49,8 @@ function updateRow(qso) {
 	if (user_options.band.show == "true"){
 		cells.eq(c++).text(qso.band);
 	}
-	if (user_options.myrefs.show == "true"){
-		cells.eq(c++).text(qso.deRefs);
+	if ( (user_options.gridsquare) && (user_options.gridsquare.show == "true")){
+		cells.eq(c++).html(qso.gridsquare);
 	}
 	if (user_options.name.show == "true"){
 		cells.eq(c++).text(qso.name);
@@ -100,9 +100,6 @@ function updateRow(qso) {
 	if ( (user_options.contest) && (user_options.contest.show == "true")){
 		cells.eq(c++).html(qso.contest);
 	}
-	if ( (user_options.gridsquare) && (user_options.gridsquare.show == "true")){
-		cells.eq(c++).html(qso.gridsquare);
-	}
 	if ( (user_options.sota) && (user_options.sota.show == "true")){
 		cells.eq(c++).html(qso.sota);
 	}
@@ -115,6 +112,9 @@ function updateRow(qso) {
 	if ( (user_options.sig) && (user_options.sig.show == "true")){
 		cells.eq(c++).html(qso.sig);
 	}
+	if (user_options.myrefs.show == "true"){
+		cells.eq(c++).text(qso.deRefs);
+	}
 
 	$('[data-bs-toggle="tooltip"]').tooltip();
 	return row;
@@ -175,8 +175,8 @@ function loadQSOTable(rows) {
 		if (user_options.band.show == "true"){
 			data.push(qso.band);
 		}
-		if (user_options.myrefs.show == "true"){
-			data.push(qso.deRefs);
+		if (user_options.gridsquare.show == "true"){
+			data.push(qso.gridsquare);
 		}
 		if (user_options.name.show == "true"){
 			data.push(qso.name);
@@ -226,9 +226,6 @@ function loadQSOTable(rows) {
 		if (user_options.contest.show == "true"){
 			data.push(qso.contest);
 		}
-		if (user_options.gridsquare.show == "true"){
-			data.push(qso.gridsquare);
-		}
 		if (user_options.sota.show == "true"){
 			data.push(qso.sota);
 		}
@@ -241,6 +238,9 @@ function loadQSOTable(rows) {
 		if (user_options.sig.show == "true"){
 			data.push(qso.sig);
 		}
+		if (user_options.myrefs.show == "true"){
+			data.push(qso.deRefs);
+		}
 
 		let createdRow = table.row.add(data).index();
 		table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID);