diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 9bb03d3..9b60a95 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -497,5 +497,18 @@
         <short>Automatically manage offline status with NetworkManager</short>
         </locale>
       </schema>
+     <schema>
+        <key>/schemas/apps/epiphany/general/never_do_case_sensitive_search</key>
+        <applyto>/apps/epiphany/general/never_do_case_sensitive_search</applyto>
+        <owner>epiphany</owner>
+        <type>bool</type>
+        <default>false</default>
+        <locale name="C">
+        <short>Never perform case-sensitive search</short>
+        <long>Never perform case-sensitive search if "true". With
+        "false" (the default), a case-sensitive search happens if the
+        search string contains uppercase characters.</long>
+        </locale>
+      </schema>
     </schemalist>
 </gconfschemafile>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index c13a5f5..dae6b82 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -37,6 +37,7 @@ G_BEGIN_DECLS
 #define CONF_AUTO_DOWNLOADS			"/apps/epiphany/general/automatic_downloads"
 #define CONF_DESKTOP_IS_HOME_DIR		"/apps/nautilus/preferences/desktop_is_home_dir"
 #define CONF_NETWORK_MANAGED			"/apps/epiphany/general/managed_network"
+#define CONF_NEVER_DO_CASE_SENSITIVE_SEARCH	"/apps/epiphany/general/never_do_case_sensitive_search"
 
 /* i18n pref */
 #define CONF_GECKO_ENABLE_PANGO			"/apps/epiphany/web/enable_pango"
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 7a089d2..8f3870d 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -26,6 +26,9 @@
 #include "ephy-embed-factory.h"
 #include "ephy-debug.h"
 
+#include "ephy-prefs.h"
+#include "eel-gconf-extensions.h"
+
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkarrow.h>
@@ -228,12 +231,17 @@ entry_changed_cb (GtkEntry *entry,
 
 	text = gtk_entry_get_text (GTK_ENTRY (priv->entry));
 
-	/* Search case-sensitively iff the string includes 
-	 * non-lowercase character.
-	 */
-	lowercase = g_utf8_strdown (text, -1);
-	case_sensitive = g_utf8_collate (text, lowercase) != 0;
-	g_free (lowercase);
+	if (eel_gconf_get_boolean (CONF_NEVER_DO_CASE_SENSITIVE_SEARCH) == TRUE)
+		case_sensitive = FALSE;
+	else
+	{
+		/* Search case-sensitively if the string includes
+		 * non-lowercase character.
+		 */
+		lowercase = g_utf8_strdown (text, -1);
+		case_sensitive = g_utf8_collate (text, lowercase) != 0;
+		g_free (lowercase);
+	}
 
 	ephy_embed_find_set_properties (get_find (toolbar), text, case_sensitive);
 	result = ephy_embed_find_find (get_find (toolbar), text, priv->links_only);