diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index e401d77e4b..ef3c9f68b2 100644
--- a/apps/theming/css/settings-admin.css
+++ b/apps/theming/css/settings-admin.css
@@ -89,6 +89,10 @@ div#theming_settings_msg {
     display: inline-block;
 }
 
+#theming-preview-logo {
+    cursor: pointer;
+}
+
 #theming-preview {
     width: 230px;
     height: 140px;
@@ -97,6 +101,7 @@ div#theming_settings_msg {
     text-align: center;
     margin-left: 123px;
     margin-top: 10px;
+    cursor: pointer;
 }
 
 #theming-preview img {
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 5d91892c00..48c479cc9c 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -160,6 +160,14 @@ $(document).ready(function () {
 
 	$('#uploadlogo').fileupload(uploadParamsLogo);
 	$('#upload-login-background').fileupload(uploadParamsLogin);
+	// clicking preview should also trigger file upload dialog
+	$('#theming-preview-logo').on('click', function(e) {
+		e.stopPropagation();
+		$('#uploadlogo').click();
+	});
+	$('#theming-preview').on('click', function() {
+		$('#upload-login-background').click();
+	});
 
 	$('#theming-name').change(function(e) {
 		var el = $(this);