diff --git a/src/main/webapp/templates/settings.html b/src/main/webapp/templates/settings.html
index 9e62d0f2..1fbf168e 100644
--- a/src/main/webapp/templates/settings.html
+++ b/src/main/webapp/templates/settings.html
@@ -6,18 +6,17 @@
 		<div class="row">
 			<div class="span2">
 				<ul class="nav nav-pills nav-stacked">
-					<li class="active">
-						<a href="#general" data-toggle="pill">${settings.general}</a>
+					<li ng-class="{active: !tab || tab == 'general'}" class="pointer">
+						<a ng-click="tab = 'general'">${settings.general}</a>
 					</li>
-					<li>
-						<a href="#custom-css" data-toggle="pill"
-							ng-click="refreshCodemirror=!refreshCodemirror">${settings.custom_css}</a>
+					<li ng-class="{active: tab == 'css'}" class="pointer">
+						<a ng-click="tab = 'css'">${settings.custom_css}</a>
 					</li>
 				</ul>
 			</div>
 			<div class="span10">
 				<div class="tab-content">
-					<div class="tab-pane active" id="general">
+					<div class="tab-pane" ng-class="{active: !tab || tab == 'general'}">
 						<div class="form-horizontal">
 							<div class="control-group">
 								<label class="control-label">${settings.general.language}</label>
@@ -55,7 +54,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="tab-pane" id="custom-css">
+					<div class="tab-pane" ng-class="{active: tab == 'css'}">
 						<textarea ng-model="settings.customCss" class="input-block-level" rows="20">
 						</textarea>
 					</div>