diff --git a/app/templates/header.html b/app/templates/header.html
index a3d596ad11..a59f61905c 100644
--- a/app/templates/header.html
+++ b/app/templates/header.html
@@ -19,7 +19,8 @@
                             class="noHIxc" 
                             name="q"
                             type="text" 
-                            value="{{ clean_query(query) }}">
+                            value="{{ clean_query(query) }}"
+                            dir="auto">
                         <input id="search-reset" type="reset" value="x">
                         <input name="tbm" value="{{ search_type }}" style="display: none">
                         <input type="submit" style="display: none;">
@@ -51,7 +52,8 @@
                             name="q"
                             spellcheck="false"
                             type="text"
-                            value="{{ clean_query(query) }}">
+                            value="{{ clean_query(query) }}"
+                            dir="auto">
                         <input name="tbm" value="{{ search_type }}" style="display: none">
                         <input type="submit" style="display: none;">
                         <div class="sc"></div>
diff --git a/app/templates/index.html b/app/templates/index.html
index 64e1650ad1..f528723b75 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -62,7 +62,8 @@
 							autocapitalize="none"
 							spellcheck="false"
 							autocorrect="off"
-							autocomplete="off">
+							autocomplete="off"
+						        dir="auto">
 					</div>
 					<input type="submit" id="search-submit" value="{{ translation['search'] }}">
 				</div>
diff --git a/app/templates/search.html b/app/templates/search.html
index 67674a15c2..4695291cdc 100644
--- a/app/templates/search.html
+++ b/app/templates/search.html
@@ -8,6 +8,7 @@
             spellcheck="false"
             autocorrect="off"
             placeholder="Whoogle Search"
-            autocomplete="off">
+            autocomplete="off"
+            dir="auto">
     <input type="submit" style="width: 9%" id="search-submit" value="Search">
 </form>