diff --git a/forms/AjaxUniqueTextField.php b/forms/AjaxUniqueTextField.php
index ffdadde24..b8b73d627 100644
--- a/forms/AjaxUniqueTextField.php
+++ b/forms/AjaxUniqueTextField.php
@@ -47,7 +47,7 @@ class AjaxUniqueTextField extends TextField {
 			'id' => $this->id(),
 			'name' => $this->getName(),
 			'value' => $this->Value(),
-			'tabindex' => $this->getTabIndex(),
+			'tabindex' => $this->getAttribute('tabindex'),
 			'maxlength' => ($this->maxLength) ? $this->maxLength : null
 		);
 		
diff --git a/forms/SimpleImageField.php b/forms/SimpleImageField.php
index 112caacc4..dc9d918a2 100644
--- a/forms/SimpleImageField.php
+++ b/forms/SimpleImageField.php
@@ -102,7 +102,7 @@ class SimpleImageField extends FileField {
 				"type" => "file", 
 				"name" => $this->name, 
 				"id" => $this->id(),
-				"tabindex" => $this->getTabIndex(),
+				"tabindex" => $this->getAttribute('tabindex'),
 				'disabled' => $this->disabled
 			)
 		);
@@ -111,7 +111,7 @@ class SimpleImageField extends FileField {
 				"type" => "hidden", 
 				"name" => "MAX_FILE_SIZE", 
 				"value" => $this->getValidator()->getAllowedMaxFileSize(),
-				"tabindex" => $this->getTabIndex()
+				"tabindex" => $this->getAttribute('tabindex'),
 			)
 		);
 		$html .= "</div>";
diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss
index 066173c1e..ab4a43314 100644
--- a/templates/AssetUploadField.ss
+++ b/templates/AssetUploadField.ss
@@ -10,7 +10,7 @@
 	<div class="ss-uploadfield-item-info">
 		<label class="ss-uploadfield-fromcomputer ss-ui-button ss-ui-action-constructive" title="<% _t('AssetUploadField.FROMCOMPUTERINFO', 'Upload from your computer') %>" data-icon="drive-upload">
 			<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>
-			<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %><% if $TabIndex %> tabindex="$TabIndex"<% end_if %> title="<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>" />
+			<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %>> title="<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>" />
 		</label>
 		
 		<div class="clear"><!-- --></div>
diff --git a/templates/UploadField.ss b/templates/UploadField.ss
index 7cb6a053b..8e09c53aa 100644
--- a/templates/UploadField.ss
+++ b/templates/UploadField.ss
@@ -45,7 +45,7 @@
 			</b></label>
 			<label class="ss-uploadfield-fromcomputer ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Upload from your computer') %>" data-icon="drive-upload">
 				<% _t('UploadField.FROMCOMPUTER', 'From your computer') %>
-				<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %><% if $TabIndex %> tabindex="$TabIndex"<% end_if %> />
+				<input id="$id" name="$getName" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %> />
 			</label>
 			<button class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Select from from files') %>" data-icon="network-cloud"><% _t('UploadField.FROMCOMPUTER', 'From files') %></button>
 			<% if not $config.autoUpload %>