diff --git a/src/metabase/api/meta/table.clj b/src/metabase/api/meta/table.clj
index 26fa790cafdbcecd56206b841731156f3629d462..441d6b8ba2b4318e281d21561f8e145791f57c1e 100644
--- a/src/metabase/api/meta/table.clj
+++ b/src/metabase/api/meta/table.clj
@@ -36,7 +36,7 @@
 
 (defendpoint GET "/:id/query_metadata" [id]
   (->404 (sel :one Table :id id)
-         (hydrate :db :fields)))
+         (hydrate :db [:fields [:target]])))
 
 (defendpoint GET "/:id/fks" [id]
   (read-check Table id)
diff --git a/src/metabase/models/field.clj b/src/metabase/models/field.clj
index 8e2a163ec4041451645c9973a53fffabf9d4d4ad..be152324c887229aece3ab70fe548b3962f2e06c 100644
--- a/src/metabase/models/field.clj
+++ b/src/metabase/models/field.clj
@@ -2,7 +2,8 @@
   (:require [korma.core :refer :all]
             [metabase.api.common :refer [check]]
             [metabase.db :refer :all]
-            (metabase.models [database :refer [Database]])
+            (metabase.models [database :refer [Database]]
+                             [foreign-key :refer [ForeignKey]])
             [metabase.util :as util]))
 
 (def special-types
@@ -73,10 +74,13 @@
 (defentity Field
   (table :metabase_field))
 
-(defmethod post-select Field [_ {:keys [table_id] :as field}]
+(defmethod post-select Field [_ {:keys [id special_type table_id] :as field}]
   (util/assoc* field
                :table     (delay (sel :one 'metabase.models.table/Table :id table_id))
                :db        (delay @(:db @(:table <>)))
+               :target    (delay (when (= "fk" special_type)
+                                   (let [dest-id (:destination_id (sel :one :fields [ForeignKey :destination_id] :origin_id id))]
+                                     (sel :one Field :id dest-id))))
                :can_read  (delay @(:can_read @(:table <>)))
                :can_write (delay @(:can_write @(:table <>)))))
 
diff --git a/test/metabase/api/meta/table_test.clj b/test/metabase/api/meta/table_test.clj
index 052a5b25fa075e8cb3040c2568a07ff71101a355..1a2b79a0de26bae6b362a6294c19f8ef9774e2c0 100644
--- a/test/metabase/api/meta/table_test.clj
+++ b/test/metabase/api/meta/table_test.clj
@@ -107,6 +107,7 @@
                    :id $
                    :field_type "info"
                    :position 0
+                   :target nil
                    :preview_display true
                    :created_at $
                    :base_type "TextField"})
@@ -120,6 +121,7 @@
                    :id $
                    :field_type "info"
                    :position 0
+                   :target nil
                    :preview_display true
                    :created_at $
                    :base_type "BigIntegerField"})]