diff --git a/site/controllers/statement_entries_controller.php b/site/controllers/statement_entries_controller.php
index 0e1f9e3..5c22c67 100644
--- a/site/controllers/statement_entries_controller.php
+++ b/site/controllers/statement_entries_controller.php
@@ -58,16 +58,21 @@ class StatementEntriesController extends AppController {
 		  ),
 	    );
 
+    if (!empty($params['post']['custom']['statement_entry_id'])) {
+      $link['ChargeEntry']        = array();
+      $link['DisbursementEntry']  = array();
+    }
+
     return array('link' => $link);
   }
 
   function gridDataTables(&$params, &$model) {
     $tables = $this->gridDataCountTables($params, $model);
 
-    if (in_array('applied', $params['post']['fields']) ||
-	isset($params['post']['custom']['statement_entry_id'])) {
-      $tables['link']['DisbursementEntry'] = array();
-      $tables['link']['ChargeEntry']  = array();
+    if (in_array('applied', $params['post']['fields'])) {
+      $tables['link'] +=
+	array('ChargeEntry'       => array(),
+	      'DisbursementEntry' => array());
     }
 
     return $tables;