diff --git a/ChangeLog b/ChangeLog
index 49468e0f82..82d2bed7c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,7 @@ phpMyAdmin - ChangeLog
 - issue #16485 Fix visual query builder missing "Build Query" button
 - issue #16565 Added 'IF EXISTS' to 'DROP EVENT' when updating events to avoid replication issues
 - issue        Removed metro fonts that where Apache-2.0 files that are incompatible with GPL-2.0
+- issue #16464 Made the relation view default to the current database when creating relations
 
 5.0.5 (not yet released)
 - issue #14494 Fix uncaught TypeError when editing partitioning
diff --git a/templates/table/relation/foreign_key_row.twig b/templates/table/relation/foreign_key_row.twig
index fd4e874910..21bec0335c 100644
--- a/templates/table/relation/foreign_key_row.twig
+++ b/templates/table/relation/foreign_key_row.twig
@@ -96,7 +96,8 @@
                 'name': 'destination_foreign_db[' ~ i ~ ']',
                 'title': 'Database'|trans,
                 'values': databases,
-                'foreign': foreign_db
+                'foreign': foreign_db,
+                'db': db
             } only %}
         </span>
     </td>
diff --git a/templates/table/relation/relational_dropdown.twig b/templates/table/relation/relational_dropdown.twig
index 9d5f3c979f..522f08a096 100644
--- a/templates/table/relation/relational_dropdown.twig
+++ b/templates/table/relation/relational_dropdown.twig
@@ -3,7 +3,8 @@
     {% set seen_key = false %}
     {% for value in values %}
         <option value="{{ value }}"
-            {%- if foreign is not same as(false) and value == foreign %}
+            {%- if (foreign is not same as(false) and value == foreign) or
+              (not foreign and db is defined and db is same as (value)) %}
                 selected="selected"
                 {%- set seen_key = true -%}
             {%- endif %}>