diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php
index 29e138ce9..554456e98 100644
--- a/application/views/logbookadvanced/edit.php
+++ b/application/views/logbookadvanced/edit.php
@@ -1,5 +1,7 @@
+<?= __("Please choose the column to be edited:"); ?><br/><br/>
 <form method="post" class="d-flex align-items-center">
 		<select id="editColumn" name="type" class="form-select form-select-sm w-auto me-2">
+			<option value="">-</option>
 			<option value="band"><?= __("Band"); ?></option>
 			<option value="date"><?= __("Date"); ?></option>
 			<option value="comment"><?= __("Comment"); ?></option>
@@ -77,7 +79,7 @@
 		<label style="display:none" id="editSatelliteModeLabel" class="mx-2 w-auto" for="editSatelliteMode"><?= __("SAT Mode"); ?></label>
 		<input style="display:none" class="form-control form-control-sm w-auto" id="editSatelliteMode" type="text" name="editSatelliteMode" placeholder="" aria-label="editSatelliteMode">
 
-		<select id="editBand" class="form-select w-auto form-select-sm" name="editBand">
+		<select style="display:none" id="editBand" class="form-select w-auto form-select-sm" name="editBand">
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
 					foreach($bandgroup as $band) {
@@ -88,8 +90,8 @@
 			?>
 		</select>
 
-		<label id="editBandRxLabel" class="mx-2 w-auto" for="gridlabel"><?= __("Band RX"); ?></label>
-		<select id="editBandRx" class="form-select w-auto form-select-sm" name="editBandRx">
+		<label style="display:none" id="editBandRxLabel" class="mx-2 w-auto" for="gridlabel"><?= __("Band RX"); ?></label>
+		<select style="display:none" id="editBandRx" class="form-select w-auto form-select-sm" name="editBandRx">
 			<option value="">-</option>
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
diff --git a/assets/js/sections/logbookadvanced_edit.js b/assets/js/sections/logbookadvanced_edit.js
index 4a8d0afe4..149705509 100644
--- a/assets/js/sections/logbookadvanced_edit.js
+++ b/assets/js/sections/logbookadvanced_edit.js
@@ -33,6 +33,7 @@ function editQsos() {
 				message: html,
 				onshown: function(dialog) {
 					prepareEditDialog();
+					$('#saveButton').prop("disabled", true);
 				},
 				buttons: [{
 					label: lang_admin_save,
@@ -237,7 +238,7 @@ function changeEditType(type) {
 	$('#editLoTW').hide();
 	$('#editContinent').hide();
 	$('#editQrz').hide();
-	editDxccStateListLabel
+	$('#saveButton').prop("disabled", false);
 	if (type == "dxcc") {
 		$('#editDxcc').show();
 	} else if (type == "iota") {
@@ -276,6 +277,8 @@ function changeEditType(type) {
 		$('#editContinent').show();
 	} else if (type == "gridsquare" || type == "sota" || type == "wwff" || type == "operator" || type == "pota" || type == "comment" || type == "qslvia" || type == "contest" || type == "qslmsg") {
 		$('#editTextInput').show();
+	} else if (type == "") {
+		$('#saveButton').prop("disabled", true);
 	}
 }