diff --git a/settings/js/personal.js b/settings/js/personal.js
index ae939aaa9e6..8336e9c8362 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -157,6 +157,10 @@ $(document).ready(function(){
 		}
 	};
 
+	$('#uploadavatarbutton').click(function(){
+		$('#uploadavatar').click();
+	});
+
 	$('#uploadavatar').fileupload(uploadparms);
 
 	$('#selectavatar').click(function(){
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 348716ca02d..93aaa5ac1e7 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -90,7 +90,8 @@ if($_['passwordChangeSupported']) {
 		<img src="<?php print_unescaped(link_to('', 'avatar.php').'?user='.OC_User::getUser().'&size=128'); ?>"><br>
 		<?php if ($_['avatar'] === "local"): ?>
 			<em><?php p($l->t('Your avatar has to be a square and either a PNG or JPG image')); ?></em><br>
-			<input type="file" class="inlineblock button" name="files[]" id="uploadavatar" value="<?php p($l->t('Upload a new avatar')); ?>">
+			<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload a new avatar')); ?></div>
+			<input type="file" class="hidden" name="files[]" id="uploadavatar">
 			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select a new avatar from your files')); ?></div>
 			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove my avatar')); ?></div>
 		<?php elseif ($_['avatar'] === "gravatar"): ?>