diff --git a/main/webapp/modules/core/scripts/project/history-panel.html b/main/webapp/modules/core/scripts/project/history-panel.html
index c13adf4ad..72abb39a1 100644
--- a/main/webapp/modules/core/scripts/project/history-panel.html
+++ b/main/webapp/modules/core/scripts/project/history-panel.html
@@ -7,7 +7,7 @@
   <a class="button button-pill-left" href="javascript:{}" bind="extractLink"></a><a class="button button-pill-right" href="javascript:{}" bind="applyLink"></a>
 </div>
 <div class="history-panel-filter" bind="bodyControlsDiv">
-<span bind="or_proj_filter"> </span><input type="text"  size="30" bind="filterInput" autofocus />
+<span bind="or_proj_filter"> </span><input type="text"  size="30" bind="filterInput" id="idfilterInput" />
 </div>
 <div class="history-panel-body" bind="bodyDiv">
   <div class="history-past" bind="pastDiv">
@@ -17,4 +17,9 @@
   <div class="history-future" bind="futureDiv">
     <div class="history-highlight" bind="futureHighlightDiv"></div>
   </div>
-</div>'
\ No newline at end of file
+</div>
+<script>
+function setFocusToTextBox(){
+    document.getElementById("idfilterInput").focus();
+}
+</script>
diff --git a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html
index ce0da045d..9418f059d 100644
--- a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html
+++ b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html
@@ -14,7 +14,7 @@
             </tr>
             <tr><td></td>
               <td bind="or_views_separator"></td>
-              <td><input size="10" value="," bind="separatorInput" autofocus />
+              <td><input size="10" value="," bind="separatorInput" id="separatorInput" />
                 <input type="checkbox" bind="regexInput" id="$split-column-regex" />
                 <label for="$split-column-regex" bind="or_views_regExp"></label></td>
             </tr>
@@ -56,4 +56,9 @@
       <button class="button" bind="cancelButton"></button>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<script>
+function setFocusToTextBox(){
+    document.getElementById("separatorInput").focus();
+}
+</script>
diff --git a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html
index aa77b14eb..4f7e712ad 100644
--- a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html
+++ b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html
@@ -14,7 +14,7 @@
             </tr>
             <tr><td></td>
               <td bind="or_views_separator"></td>
-              <td><input size="10" value="," bind="separatorInput" autofocus />
+              <td><input size="10" value="," bind="separatorInput" id="separatorInput" />
                 <input type="checkbox" bind="regexInput" id="$split-column-regex" />
                 <label for="$split-multi-valued-cells-regex" bind="or_views_regExp"></label></td>
             </tr>
@@ -37,4 +37,9 @@
       <button class="button" bind="cancelButton"></button>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<script>
+function setFocusToTextBox(){
+    document.getElementById("separatorInput").focus();
+}
+</script>