diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index b6b6f5179..1bafa9ab3 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -588,7 +588,7 @@ class Site extends BaseAdminModule
 			'$touch_icon'       => ['touch_icon', L10n::t('Touch icon'), Config::get('system', 'touch_icon'), L10n::t('Link to an icon that will be used for tablets and mobiles.')],
 			'$additional_info'  => ['additional_info', L10n::t('Additional Info'), $additional_info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
 			'$language'         => ['language', L10n::t('System language'), Config::get('system', 'language'), '', $lang_choices],
-			'$theme'            => ['theme', L10n::t('System theme'), Config::get('system', 'theme'), L10n::t('Default system theme - may be over-ridden by user profiles - <a href="/admin/themes">Change default theme settings</a>'), $theme_choices],
+			'$theme'            => ['theme', L10n::t('System theme'), Config::get('system', 'theme'), L10n::t('Default system theme - may be over-ridden by user profiles - <a href="/admin/themes" id="cnftheme">Change default theme settings</a>'), $theme_choices],
 			'$theme_mobile'     => ['theme_mobile', L10n::t('Mobile system theme'), Config::get('system', 'mobile-theme', '---'), L10n::t('Theme for mobile devices'), $theme_choices_mobile],
 			'$ssl_policy'       => ['ssl_policy', L10n::t('SSL link policy'), (string)intval(Config::get('system', 'ssl_policy')), L10n::t('Determines whether generated links should be forced to use SSL'), $ssl_choices],
 			'$force_ssl'        => ['force_ssl', L10n::t('Force SSL'), Config::get('system', 'force_ssl'), L10n::t('Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.')],
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index a4df56279..823753768 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -1,4 +1,12 @@
-<div id='adminpage'>
+<script>
+	$(function(){
+		$("#cnftheme").click(function(){
+			document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
+			return false;
+		});
+	});
+</script>
+<div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<form action="{{$baseurl}}/admin/site" method="post">
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index 2cebb620b..4c0a6ce06 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -11,6 +11,11 @@
 				$(element).addClass('in');
 			window.scroll(0, $(element).offset().top - 120);
 		}
+
+		$("#cnftheme").click(function(){
+			document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
+			return false;
+		});
 	});
 </script>
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>