diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 73b52942..6612b84e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -202,7 +202,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 			$opts = $v;
 		}
 		foreach ($opts as $key => $val) {
-			$return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '') . '>' . h($val);
+			$return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === (string) $selected ? ' selected' : '') . '>' . h($val);
 		}
 		if (is_array($v)) {
 			$return .= '</optgroup>';
diff --git a/changes.txt b/changes.txt
index 5c2c82d4..74fffddf 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 4.16.1-dev:
 SQLite: Show all supported pragmas in Variables
+Editor: PDO: Select value of foreign key in edit (bug #847)
 
 Adminer 4.16.0 (released 2025-02-20):
 MySQL: Fix saving bit(64) values (bug #839)