diff --git a/public/app/partials/edit_json.html b/public/app/partials/edit_json.html
index 8635174e5a6..4a7231682a1 100644
--- a/public/app/partials/edit_json.html
+++ b/public/app/partials/edit_json.html
@@ -1,5 +1,4 @@
 <div ng-controller="JsonEditorCtrl">
-
 	<div class="gf-box-header">
 		<div class="gf-box-title">
 			<i class="fa fa-edit"></i>
@@ -11,12 +10,13 @@
 		</button>
 	</div>
 
-	<div class="gf-box-body" style="height: 500px">
-		<textarea ng-model="json" rows="20" spellcheck="false" style="width: 100%;"></textarea>
-		<br>
-		<br>
+	<div class="gf-box-body json-box-body">
+		<div class="gf-form">
+			<textarea ng-model="json" rows="20" spellcheck="false"></textarea>
+		</div>
 
-		<button type="button" class="btn btn-success" ng-show="canUpdate" ng-click="update(); dismiss();">Update</button>
+		<div class="gf-form-button-row">
+			<button type="button" class="btn btn-success" ng-show="canUpdate" ng-click="update(); dismiss();">Update</button>
+		</div>
 	</div>
-
 </div>
diff --git a/public/sass/components/_dashboard.scss b/public/sass/components/_dashboard.scss
index 293ac202318..314b1a92c3c 100644
--- a/public/sass/components/_dashboard.scss
+++ b/public/sass/components/_dashboard.scss
@@ -286,3 +286,10 @@ div.flot-text {
   }
 }
 
+.json-box-body {
+  min-height: 500px;
+  textarea {
+    width: 100%;
+    background-color: $gray-1;
+  }
+}