diff --git a/awx/ui_next/src/components/ButtonGroup.jsx b/awx/ui_next/src/components/CodeMirrorInput/ButtonGroup.jsx
similarity index 100%
rename from awx/ui_next/src/components/ButtonGroup.jsx
rename to awx/ui_next/src/components/CodeMirrorInput/ButtonGroup.jsx
diff --git a/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx b/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
index 2e58337ccc..d9aae454c1 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/VariablesInput.jsx
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
 import { string, func, bool, number } from 'prop-types';
 import { Button, Split, SplitItem } from '@patternfly/react-core';
 import styled from 'styled-components';
-import ButtonGroup from '@components/ButtonGroup';
 import { yamlToJson, jsonToYaml, isJson } from '@util/yaml';
 import CodeMirrorInput from './CodeMirrorInput';
+import { ButtonGroup } from '.';
 import { JSON_MODE, YAML_MODE } from './constants';
 
 function formatJson(jsonString) {
diff --git a/awx/ui_next/src/components/CodeMirrorInput/YamlJsonToggle.jsx b/awx/ui_next/src/components/CodeMirrorInput/YamlJsonToggle.jsx
index 85703e5674..34d4d4a2ba 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/YamlJsonToggle.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/YamlJsonToggle.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { oneOf, func } from 'prop-types';
 import styled from 'styled-components';
 import { Button } from '@patternfly/react-core';
-import ButtonGroup from '../ButtonGroup';
+import { ButtonGroup } from '.';
 
 const SmallButton = styled(Button)`
   padding: 3px 8px;
diff --git a/awx/ui_next/src/components/CodeMirrorInput/index.js b/awx/ui_next/src/components/CodeMirrorInput/index.js
index 9cad016228..26ad542421 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/index.js
+++ b/awx/ui_next/src/components/CodeMirrorInput/index.js
@@ -4,3 +4,4 @@ export default CodeMirrorInput;
 export { default as VariablesDetail } from './VariablesDetail';
 export { default as VariablesInput } from './VariablesInput';
 export { default as VariablesField } from './VariablesField';
+export { default as ButtonGroup } from './ButtonGroup';