diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php
index fd764566a6..92745d89bb 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //set http get variables to php variables
-	$search_all = check_str($_GET["search_all"]);
+	$search_all = strtolower(check_str($_GET["search_all"]));
 	$schema_uuid = check_str($_GET["schema_uuid"]);
 	if (strlen($_GET["data_row_uuid"])>0) { //update
 		$data_row_uuid = check_str($_GET["data_row_uuid"]);
@@ -406,7 +406,7 @@ else {
 						}
 					}
 					else {
-						$sql .= "and data_field_value like '%$search_all%' )\n";
+						$sql .= "and lower(data_field_value) like '%$search_all%' )\n";
 					}
 				}
 			}
diff --git a/app/schemas/schema_data_view.php b/app/schemas/schema_data_view.php
index 2a2de1c02c..c8eca3170e 100644
--- a/app/schemas/schema_data_view.php
+++ b/app/schemas/schema_data_view.php
@@ -45,7 +45,7 @@ if (strlen($_GET["id"]) > 0) {
 	if (strlen($_GET["data_parent_row_uuid"])>0) {
 		$data_parent_row_uuid = $_GET["data_parent_row_uuid"];
 	}
-	$search_all = check_str($_GET["search_all"]);
+	$search_all = strtolower(check_str($_GET["search_all"]));
 }
 
 //used for changing the order
@@ -142,7 +142,7 @@ if (strlen($_GET["id"]) > 0) {
 				}
 			}
 			else {
-				$sql .= "and data_field_value like '%$search_all%' \n";
+				$sql .= "and lower(data_field_value) like '%$search_all%' \n";
 			}
 		}
 		else {