diff --git a/public/language/en-GB/admin/manage/tags.json b/public/language/en-GB/admin/manage/tags.json
index 6d7cbdb289..928a6a5068 100644
--- a/public/language/en-GB/admin/manage/tags.json
+++ b/public/language/en-GB/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",
diff --git a/public/language/en-GB/admin/settings/tags.json b/public/language/en-GB/admin/settings/tags.json
index d329cff68b..b2d27cd816 100644
--- a/public/language/en-GB/admin/settings/tags.json
+++ b/public/language/en-GB/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index fda5c26e90..4493bd67db 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -2,6 +2,11 @@
 	<div class="col-lg-9">
 		<div class="panel panel-default tag-management">
 			<div class="panel-body">
+				<div class="alert alert-info">
+					<strong>[[admin/manage/tags:create-modify]]</strong>
+					<p>[[admin/manage/tags:description]]</p>
+				</div>
+
 				<!-- IF !tags.length -->
 				[[admin/manage/tags:none]]
 				<!-- ENDIF !tags.length -->
@@ -36,20 +41,22 @@
 
 	<div class="col-lg-3 acp-sidebar">
 		<div class="panel panel-default">
-			<div class="panel-heading">[[admin/manage/tags:create-modify]]</div>
 			<div class="panel-body">
-				<p>[[admin/manage/tags:description]]</p>
 				<button class="btn btn-primary btn-block" id="create">[[admin/manage/tags:create]]</button>
 				<button class="btn btn-primary btn-block" id="modify">[[admin/manage/tags:modify]]</button>
 				<button class="btn btn-primary btn-block" id="rename">[[admin/manage/tags:rename]]</button>
 				<button class="btn btn-warning btn-block" id="deleteSelected">[[admin/manage/tags:delete]]</button>
+				<hr />
+				<a class="btn btn-default btn-block" href="{config.relative_path}/admin/settings/tags">
+					<i class="fa fa-external-link"></i>
+					[[admin/manage/tags:settings]]
+				</a>
 			</div>
 		</div>
 
 		<div class="panel panel-default">
 			<div class="panel-body">
 				<input class="form-control" type="text" id="tag-search" placeholder="[[admin/manage/tags:search]]"/><br/>
-				[[admin/manage/tags:settings, {config.relative_path}/admin/settings/tags]]
 			</div>
 		</div>
 	</div>
diff --git a/src/views/admin/settings/tags.tpl b/src/views/admin/settings/tags.tpl
index 5d93bda00f..a96dc5ee59 100644
--- a/src/views/admin/settings/tags.tpl
+++ b/src/views/admin/settings/tags.tpl
@@ -4,6 +4,12 @@
 	<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/tags:tag]]</div>
 	<div class="col-sm-10 col-xs-12">
 		<form>
+			<div class="form-group">
+				<a class="btn btn-primary" href="{config.relative_path}/admin/manage/tags">
+					<i class="fa fa-external-link"></i>
+					[[admin/settings/tags:link-to-manage]]
+				</a>
+			</div>
 			<div class="form-group">
 				<label for="minimumTagsPerTopics">[[admin/settings/tags:min-per-topic]]</label>
 				<input id="minimumTagsPerTopics" type="text" class="form-control" value="0" data-field="minimumTagsPerTopic">