diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f91ae5..96a05f18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## Adminer dev
+- PostgreSQL: Order NULL last
 
 ## Adminer 5.4.2 (released 2026-02-08)
 - Avoid denial-of-service via version check (GHSA-q4f2-39gr-45jh, regression from 4.6.2)
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 933ec267..f1de77ad 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -614,7 +614,7 @@ class Adminer {
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if ($val != "") {
 				$return[] = (preg_match('~^((COUNT\(DISTINCT |[A-Z0-9_]+\()(`(?:[^`]|``)+`|"(?:[^"]|"")+")\)|COUNT\(\*\))$~', $val) ? $val : idf_escape($val)) //! MS SQL uses []
-					. (isset($_GET["desc"][$key]) ? " DESC" : "")
+					. (isset($_GET["desc"][$key]) ? " DESC" . (JUSH == 'pgsql' && idx($fields[$val], "null") ? " NULLS LAST" : "") : "")
 				;
 			}
 		}