diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index ac6beed8fa3..5bff9a7f3fb 100644
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -318,7 +318,7 @@ function (angular, $, kbn, moment, _) {
           }
         });
 
-        function render_panel_as_graphite_png(url) {          
+        function render_panel_as_graphite_png(url) {
           url += '&width=' + elem.width();
           url += '&height=' + elem.css('height').replace('px', '');
           url += '&bgcolor=1f1f1f'; // @grayDarker & @kibanaPanelBackground
diff --git a/src/app/directives/kibanaPanel.js b/src/app/directives/kibanaPanel.js
index 664707aeebf..0dc7621648a 100644
--- a/src/app/directives/kibanaPanel.js
+++ b/src/app/directives/kibanaPanel.js
@@ -73,7 +73,7 @@ function (angular, $, _) {
             elem.removeClass("ng-cloak");
           }
 
-          newScope.$on('$destroy',function(){
+          newScope.$on('$destroy',function() {
             elem.unbind();
             elem.remove();
           });
diff --git a/src/app/panels/text/editor.html b/src/app/panels/text/editor.html
index 02177bc34d5..6af4dc069c2 100644
--- a/src/app/panels/text/editor.html
+++ b/src/app/panels/text/editor.html
@@ -8,9 +8,11 @@
     </div>
   </div>
 
-  <label class=small>Content 
+  <label class=small>Content
     <span ng-show="panel.mode == 'html'">(This area uses HTML sanitized via AngularJS's <a href='http://docs.angularjs.org/api/ngSanitize.$sanitize'>$sanitize</a> service)</span>
     <span ng-show="panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span>
   </label>
-  <textarea ng-model="panel.content" rows="6" style="width:95%"></textarea>
+
+  <textarea ng-model="panel.content" rows="6" style="width:95%" ng-change="render()" ng-model-onblur>
+  </textarea>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/text/module.html b/src/app/panels/text/module.html
index 3b7269c09f9..680380aaf27 100644
--- a/src/app/panels/text/module.html
+++ b/src/app/panels/text/module.html
@@ -1,4 +1,4 @@
-<div ng-controller='text' ng-init="init()">
+<div ng-controller='text' ng-init="init()" style="min-height:{{panel.height || row.height}}">
   <!--<p ng-style="panel.style" ng-bind-html-unsafe="panel.content | striphtml | newlines"></p>-->
   <markdown ng-show="ready && panel.mode == 'markdown'">
     {{panel.content}}
diff --git a/src/app/panels/text/module.js b/src/app/panels/text/module.js
index 063b59e88df..6fccc425308 100644
--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -48,6 +48,10 @@ function (angular, app, _, require) {
       $scope.ready = false;
     };
 
+    $scope.render = function() {
+      $scope.$emit('render');
+    };
+
   });
 
   module.directive('markdown', function() {
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html
index 6950b20afeb..45a93071f4b 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -156,5 +156,5 @@
   </div>
 
   <button ng-click="add_row(dashboard.current,row); reset_row();" class="btn btn-success" ng-show="editor.index == 1">Create Row</button>
-  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();dashboard.refresh()">Close</button>
+  <button type="button" class="btn btn-info" ng-click="editor.index=0;dismiss();reset_panel();dashboard.refresh()">Close</button>
 </div>
\ No newline at end of file
diff --git a/src/app/partials/paneleditor.html b/src/app/partials/paneleditor.html
index 5aa752f6fd5..62692c5f88e 100644
--- a/src/app/partials/paneleditor.html
+++ b/src/app/partials/paneleditor.html
@@ -19,5 +19,5 @@
 
 <div class="modal-footer">
   <!-- close_edit() is provided here to allow for a scope to perform action on dismiss -->
-  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss()">Cancel</button>
+  <button type="button" class="btn btn-info" ng-click="editor.index=0;dismiss()">Close</button>
 </div>
\ No newline at end of file