diff --git a/core/js/js.js b/core/js/js.js
index f697f2b853..7585d4b09d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -419,6 +419,11 @@ $(document).ready(function(){
 		}
 	});
 
+	$('#settings #expand').keydown(function(event) {
+		if (event.which == 13 || event.which == 32) {
+			$('#expand').click()
+		}
+	});
 	$('#settings #expand').click(function(event) {
 		$('#settings #expanddiv').slideToggle();
 		event.stopPropagation();
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 674b185303..b832ac2636 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -44,7 +44,7 @@
 			</ul>
 
 			<ul id="settings" class="svg">
-				<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
+				<img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
 				<span><?php echo $l->t('Settings');?></span>
 				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
 				<?php foreach($_['settingsnavigation'] as $entry):?>