diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
index 174a4c0a7ca..be20ac7e159 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
@@ -175,7 +175,7 @@ export class Gauge extends PureComponent<Props> {
     return (
       <div
         style={{
-          height: `${height * 0.9}px`,
+          height: `${Math.min(height, width * 1.3)}px`,
           width: `${Math.min(width, height * 1.3)}px`,
           top: '10px',
           margin: 'auto',
diff --git a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
index 25e398faa78..0175065e5a0 100644
--- a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
+++ b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx
@@ -43,12 +43,12 @@ export class VizRepeater extends PureComponent<Props> {
     let vizWidth = width;
     let vizHeight = height;
 
-    if (orientation === 'horizontal' || width > height) {
+    if ((orientation && orientation === 'horizontal') || width > height) {
       vizContainerStyle = horizontalVisualization;
       vizWidth = repeatingVizWidth;
     }
 
-    if (orientation === 'vertical' || height > width) {
+    if ((orientation && orientation === 'vertical') || height > width) {
       vizContainerStyle = verticalVisualization;
       vizHeight = repeatingVizHeight;
     }
diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx
index 4381338d640..47c610ab78f 100644
--- a/public/app/plugins/panel/gauge/GaugePanel.tsx
+++ b/public/app/plugins/panel/gauge/GaugePanel.tsx
@@ -45,14 +45,14 @@ export class GaugePanel extends PureComponent<Props> {
     const { options, width, height } = this.props;
     const value = timeSeries[0].stats[options.valueOptions.stat];
 
-    return <div className="singlestat-panel">{this.renderGauge(value, width, height)}</div>;
+    return <div style={{ display: 'flex' }}>{this.renderGauge(value, width, height)}</div>;
   }
 
   renderGaugeWithTableData(panelData) {
     const { width, height } = this.props;
     const firstTableDataValue = panelData.tableData.rows[0].find(prop => prop > 0);
 
-    return <div className="singlestat-panel">{this.renderGauge(firstTableDataValue, width, height)}</div>;
+    return <div style={{ display: 'flex' }}>{this.renderGauge(firstTableDataValue, width, height)}</div>;
   }
 
   render() {
@@ -73,7 +73,7 @@ export class GaugePanel extends PureComponent<Props> {
                 const value = stat !== 'name' ? series.stats[stat] : series.label;
 
                 return (
-                  <div className="singlestat-panel" key={`${series.label}-${index}`} style={vizContainerStyle}>
+                  <div key={`${series.label}-${index}`} style={Object.assign(vizContainerStyle, { display: 'flex' })}>
                     {this.renderGauge(value, vizWidth, vizHeight)}
                   </div>
                 );