diff --git a/datasette/url_builder.py b/datasette/url_builder.py
index 498ec85d..574bf3c1 100644
--- a/datasette/url_builder.py
+++ b/datasette/url_builder.py
@@ -28,7 +28,8 @@ class Urls:
         return self.path("-/logout")
 
     def database(self, database, format=None):
-        return self.path(tilde_encode(database), format=format)
+        db = self.ds.get_database(database)
+        return self.path(tilde_encode(db.route), format=format)
 
     def table(self, database, table, format=None):
         path = f"{self.database(database)}/{tilde_encode(table)}"
diff --git a/datasette/views/table.py b/datasette/views/table.py
index 7fa1da3a..8745c28a 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -141,10 +141,9 @@ class RowTableShared(DataView):
                         "is_special_link_column": is_special_link_column,
                         "raw": pk_path,
                         "value": markupsafe.Markup(
-                            '<a href="{base_url}{database}/{table}/{flat_pks_quoted}">{flat_pks}</a>'.format(
+                            '<a href="{table_path}/{flat_pks_quoted}">{flat_pks}</a>'.format(
                                 base_url=base_url,
-                                database=database,
-                                table=tilde_encode(table),
+                                table_path=self.ds.urls.table(database, table),
                                 flat_pks=str(markupsafe.escape(pk_path)),
                                 flat_pks_quoted=path_from_row_pks(row, pks, not pks),
                             )
diff --git a/tests/test_routes.py b/tests/test_routes.py
index dd3bc644..211b77b5 100644
--- a/tests/test_routes.py
+++ b/tests/test_routes.py
@@ -61,7 +61,7 @@ async def ds_with_route():
     ds = Datasette()
     ds.remove_database("_memory")
     db = Database(ds, is_memory=True, memory_name="route-name-db")
-    ds.add_database(db, name="name", route="route-name")
+    ds.add_database(db, name="original-name", route="custom-route-name")
     await db.execute_write_script(
         """
         create table if not exists t (id integer primary key);
@@ -75,8 +75,8 @@ async def ds_with_route():
 async def test_db_with_route_databases(ds_with_route):
     response = await ds_with_route.client.get("/-/databases.json")
     assert response.json()[0] == {
-        "name": "name",
-        "route": "route-name",
+        "name": "original-name",
+        "route": "custom-route-name",
         "path": None,
         "size": 0,
         "is_mutable": True,
@@ -90,12 +90,12 @@ async def test_db_with_route_databases(ds_with_route):
     "path,expected_status",
     (
         ("/", 200),
-        ("/name", 404),
-        ("/name/t", 404),
-        ("/name/t/1", 404),
-        ("/route-name", 200),
-        ("/route-name/t", 200),
-        ("/route-name/t/1", 200),
+        ("/original-name", 404),
+        ("/original-name/t", 404),
+        ("/original-name/t/1", 404),
+        ("/custom-route-name", 200),
+        ("/custom-route-name/t", 200),
+        ("/custom-route-name/t/1", 200),
     ),
 )
 async def test_db_with_route_that_does_not_match_name(
@@ -103,3 +103,7 @@ async def test_db_with_route_that_does_not_match_name(
 ):
     response = await ds_with_route.client.get(path)
     assert response.status_code == expected_status
+    # There should be links to custom-route-name but none to original-name
+    if response.status_code == 200:
+        assert "/custom-route-name" in response.text
+        assert "/original-name" not in response.text