diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
index 06c44cc8262..9ab74fe6d74 100644
--- a/public/app/core/directives/dash_edit_link.js
+++ b/public/app/core/directives/dash_edit_link.js
@@ -8,8 +8,7 @@ function ($, coreModule) {
   var editViewMap = {
     'settings':    { src: 'app/features/dashboard/partials/settings.html', title: "Settings" },
     'annotations': { src: 'app/features/annotations/partials/editor.html', title: "Annotations" },
-    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" },
-    'metadata':    { src: 'app/features/dashboard/partials/metadata.html', title: "Metadata" }
+    'templating':  { src: 'app/features/templating/partials/editor.html', title: "Templating" }
   };
 
   coreModule.directive('dashEditorLink', function($timeout) {
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index baf6a9f3a62..8fa6da1ee2f 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -39,7 +39,6 @@
 						<li><a class="pointer" ng-click="editJson();">View JSON</a></li>
 						<li ng-if="contextSrv.isEditor"><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
 						<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
-            <li><a class="pointer" ng-click="openEditView('metadata');">Metadata</a></li>
 					</ul>
 				</li>
 			</ul>
diff --git a/public/app/features/dashboard/partials/metadata.html b/public/app/features/dashboard/partials/metadata.html
deleted file mode 100644
index 11eaa6d542a..00000000000
--- a/public/app/features/dashboard/partials/metadata.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="gf-box-header">
-	<div class="gf-box-title">
-		<i class="fa fa-info"></i>
-		Metadata
-	</div>
-  <button class="gf-box-header-close-btn" ng-click="dismiss();">
-    <i class="fa fa-remove"></i>
-  </button>
-</div>
-
-<div class="gf-box-body" style="padding-bottom: 50px;">
-  <div class="editor-row">
-		<div class="tight-form-section">
-			<h5>Dashboard info</h5>
-      <div class="tight-form">
-        <ul class="tight-form-list">
-          <li class="tight-form-item" style="width: 120px">
-            Last updated at:
-          </li>
-          <li class="tight-form-item" style="width: 180px">
-            {{formatDate(dashboardMeta.updated)}}
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-      <div class="tight-form last">
-        <ul class="tight-form-list">
-          <li class="tight-form-item" style="width: 120px">
-            Created at:
-          </li>
-          <li class="tight-form-item" style="width: 180px">
-            {{formatDate(dashboardMeta.created)}}
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-    </div>
-	</div>
-</div>
-
-<div class="gf-box-footer">
-	<div class="grafana-version-info">
-		<span class="editor-option small">
-			Grafana version: {{contextSrv.version}} &nbsp;&nbsp;
-		</span>
-		<span grafana-version-check>
-		</span>
-	</div>
-</div>
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 541ef45e9ab..347265afed4 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -5,7 +5,7 @@
 	</div>
 
 	<div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
-		<div ng-repeat="tab in ['General', 'Rows', 'Links', 'Time picker']" data-title="{{tab}}">
+		<div ng-repeat="tab in ['General', 'Rows', 'Links', 'Time picker', 'Metadata']" data-title="{{tab}}">
 		</div>
 	</div>
 
@@ -114,6 +114,36 @@
 		<gf-time-picker-settings dashboard="dashboard"></gf-time-picker-settings>
 	</div>
 
+  <div ng-if="editor.index == 4">
+    <div class="editor-row">
+      <div class="tight-form-section">
+        <h5>Info</h5>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Last updated at:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{formatDate(dashboardMeta.updated)}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+        <div class="tight-form last">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Created at:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{formatDate(dashboardMeta.created)}}
+           </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
 </div>
 
 <div class="clearfix"></div>