diff --git a/mod/data/view.php b/mod/data/view.php
index 066f3b42364..d65ebf51074 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -495,7 +495,7 @@
                         continue;
                     }
                     $tables .= ', '.$CFG->prefix.'data_content c'.$key.' ';
-                    $where .= ' AND c'.$key.'.recordid = r.id';
+                    $where .= ' AND c'.$key.'.recordid = r.id AND c'.$key.'.fieldid = '.$key;
                     $searchselect .= ' AND ('.$val->sql.') ';
                 }
             } else if ($search) {