diff --git a/css/contacts.css b/css/contacts.css
index 0ab30d18..24836434 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -363,6 +363,11 @@ ul.propertylist { width: 450px; }
 #contacts-settings li,#contacts-settings li:hover { background-color: transparent; white-space: nowrap; }
 #contacts-settings a.action:not(.settings) { width: 16px; height: 16px; }
 #contacts-settings .actions { float: right; }
+#contacts-settings h2 {
+	text-indent: .5em;
+	font-weight: bold;
+	font-size: 1.2em;
+}
 
 /* Single elements */
 #file_upload_target, #import_upload_target, #crop_target { display:none; }
diff --git a/js/app.js b/js/app.js
index 27625def..89b41473 100644
--- a/js/app.js
+++ b/js/app.js
@@ -567,6 +567,8 @@ OC.Contacts = OC.Contacts || {
 				self.$settings.switchClass('open', '');
 				$('body').unbind('click', bodyListener);
 			} else {
+				// FIXME: Settings needs to be refactored
+				self.$settings.find('h2').trigger('click');
 				self.$settings.switchClass('', 'open');
 				$('body').bind('click', bodyListener);
 			}
@@ -773,12 +775,12 @@ OC.Contacts = OC.Contacts || {
 			self.openContact($(this).data('id'));
 		});
 
-		this.$settings.find('h3').on('click keydown', function(event) {
+		this.$settings.find('h2').on('click keydown', function(event) {
 			if(wrongKey(event)) {
 				return;
 			}
 			if($(this).next('ul').is(':visible')) {
-				$(this).next('ul').slideUp();
+				//$(this).next('ul').slideUp();
 				return;
 			}
 			console.log('settings');