diff --git a/src/app/controllers/row.js b/src/app/controllers/row.js
index 87b3ad5ce64..16005ba5dd6 100644
--- a/src/app/controllers/row.js
+++ b/src/app/controllers/row.js
@@ -125,12 +125,17 @@ function (angular, app, _) {
         type    : type
       };
 
-      if (!$scope.row.height) {
-        $scope.row.height = "200px";
-      }
-      else if($scope.row.height.indexOf('px') === -1) {
-        $scope.row.height = $scope.row.height + 'px';
+      function fixRowHeight(height) {
+        if (!height) {
+          return '200px';
+        }
+        if (!_.isString(height)) {
+          return height + 'px';
+        }
+        return height;
       }
+
+      $scope.row.height = fixRowHeight($scope.row.height);
     };
 
     /** @scratch /panels/2