diff --git a/CRM/SoftCredit/SoftCreditQueryObject.php b/CRM/SoftCredit/SoftCreditQueryObject.php
index 1cb7f68..98a8397 100644
--- a/CRM/SoftCredit/SoftCreditQueryObject.php
+++ b/CRM/SoftCredit/SoftCreditQueryObject.php
@@ -28,9 +28,9 @@ class CRM_SoftCredit_SoftCreditQueryObject extends CRM_Contact_BAO_Query_Interfa
     }
     list($name, $op, $value, $grouping, $wildcard) = reset($query->_paramLookup['soft_credit_name']);
     if ($value) {
-      $query->_where[$grouping][] = "civicrm_contact_d.sort_name LIKE '%{$value}%'";
-      $query->_whereTables['civicrm_contribution_soft_contact'] = 1;
-      $query->_tables['civicrm_contribution_soft_contact'] = 1;
+      $query->_where[$grouping][] = "civicrm_contact_creditee.sort_name LIKE '%{$value}%'";
+      $query->_whereTables['civicrm_contribution_soft_creditee_contact'] = 1;
+      $query->_tables['civicrm_contribution_soft_creditee_contact'] = 1;
       $query->_qill[$grouping][] = ts("%1 %2 - '%3'", [1 => 'Soft Creditee\'s name', 2 => 'LIKE', 3 => $value]);
     }
   }
@@ -42,6 +42,12 @@ class CRM_SoftCredit_SoftCreditQueryObject extends CRM_Contact_BAO_Query_Interfa
    *
    */
   public function from($name, $mode, $side) {
+    if ($name == 'civicrm_contribution_soft_creditee_contact') {
+      return " $side JOIN civicrm_contact civicrm_contact_creditee
+        ON (civicrm_contribution_soft.contact_id = civicrm_contact_creditee.id)
+        AND contribution_search_scredit_combined.scredit_id IS NOT NULL
+      ";
+    }
   }
 
   /**