diff --git a/ui/app/components/json-viewer.js b/ui/app/components/json-viewer.js
index bcb803099..148f3d70a 100644
--- a/ui/app/components/json-viewer.js
+++ b/ui/app/components/json-viewer.js
@@ -1,10 +1,11 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
-import { classNames } from '@ember-decorators/component';
+import { classNames, classNameBindings } from '@ember-decorators/component';
 import classic from 'ember-classic-decorator';
 
 @classic
 @classNames('json-viewer')
+@classNameBindings('fluidHeight:has-fluid-height')
 export default class JsonViewer extends Component {
   json = null;
 
diff --git a/ui/app/styles/components.scss b/ui/app/styles/components.scss
index ae08d6add..ea66946de 100644
--- a/ui/app/styles/components.scss
+++ b/ui/app/styles/components.scss
@@ -18,6 +18,7 @@
 @import './components/image-file.scss';
 @import './components/inline-definitions';
 @import './components/job-diff';
+@import './components/json-viewer';
 @import './components/lifecycle-chart';
 @import './components/loading-spinner';
 @import './components/metrics';
diff --git a/ui/app/styles/components/json-viewer.scss b/ui/app/styles/components/json-viewer.scss
new file mode 100644
index 000000000..68b322c79
--- /dev/null
+++ b/ui/app/styles/components/json-viewer.scss
@@ -0,0 +1,5 @@
+.json-viewer {
+  &.has-fluid-height .CodeMirror-scroll {
+    min-height: 0;
+  }
+}