diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index c94a824c..2da3e053 100644
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -33,7 +33,7 @@ if ($_POST && !$error && !isset($_GET["select"])) {
 		if (isset($_GET["default"])) {
 			query_redirect("ALTER TABLE " . idf_escape($_GET["edit"]) . implode(",", $set), $location, lang('Default values has been set.'));
 		} elseif ($update) {
-			query_redirect("UPDATE " . idf_escape($_GET["edit"]) . " SET" . implode(",", $set) . "\nWHERE $where LIMIT 1", $location, lang('Item has been updated.'));
+			query_redirect("UPDATE " . idf_escape($_GET["edit"]) . " SET" . implode(",", $set) . "\nWHERE $where\nLIMIT 1", $location, lang('Item has been updated.'));
 		} else {
 			query_redirect("INSERT INTO " . idf_escape($_GET["edit"]) . " SET" . implode(",", $set), $location, lang('Item has been inserted.'));
 		}
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 15c88729..c8108986 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -107,10 +107,10 @@ if ($_POST && !$error) {
 				if ($_POST["clone"]) {
 					$set[] = ($val !== false ? $val : idf_escape($name));
 				} elseif ($val !== false) {
-					$set[] = "\n" . idf_escape($name) . " = $val";
+					$set[] = idf_escape($name) . " = $val";
 				}
 			}
-			$command .= ($_POST["clone"] ? "\nSELECT " . implode(", ", $set) . " FROM " . idf_escape($_GET["select"]) : " SET" . implode(",", $set));
+			$command .= ($_POST["clone"] ? "\nSELECT " . implode(", ", $set) . "\nFROM " . idf_escape($_GET["select"]) : " SET\n" . implode(",\n", $set));
 		}
 		if ($_POST["delete"] || $set) {
 			if ($_POST["all"]) {
@@ -119,7 +119,7 @@ if ($_POST && !$error) {
 			} else {
 				foreach ((array) $_POST["check"] as $val) {
 					// where may not be unique so OR can't be used
-					$result = queries($command . "\nWHERE " . where_check($val) . " LIMIT 1");
+					$result = queries($command . "\nWHERE " . where_check($val) . "\nLIMIT 1");
 					if (!$result) {
 						break;
 					}