diff --git a/package.json b/package.json
index 7fe3c6b367462..58e95d6e6b9a2 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "@babel/register": "7.4.4",
     "@elastic/charts": "^7.0.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 60de120814330..96b39d5fb32cb 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 4654cdb8de3c3..52de10f986ed3 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "react": "^16.8.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index 21a8961f3cf61..544f15ca072ee 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -1,14 +1,14 @@
 {
   "name": "kbn_tp_embeddable_explorer",
   "version": "1.0.0",
-  "main":"target/test/plugin_functional/plugins/kbn_tp_embeddable_explorer",
+  "main": "target/test/plugin_functional/plugins/kbn_tp_embeddable_explorer",
   "kibana": {
     "version": "kibana",
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "react": "^16.8.0"
   },
   "scripts": {
@@ -16,7 +16,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@kbn/plugin-helpers" : "9.0.2",
+    "@kbn/plugin-helpers": "9.0.2",
     "typescript": "^3.3.3333"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index 19c9ccff34657..eb86b1ebdca91 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -1,14 +1,14 @@
 {
   "name": "kbn_tp_sample_panel_action",
   "version": "1.0.0",
-  "main":"target/test/plugin_functional/plugins/kbn_tp_sample_panel_action",
+  "main": "target/test/plugin_functional/plugins/kbn_tp_sample_panel_action",
   "kibana": {
     "version": "kibana",
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "react": "^16.8.0"
   },
   "scripts": {
@@ -16,7 +16,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@kbn/plugin-helpers" : "9.0.2",
+    "@kbn/plugin-helpers": "9.0.2",
     "typescript": "^3.3.3333"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
index ca0aa4c7bacb8..598d42db77194 100644
--- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
index e73d41ee83e44..6b77ddf22e73d 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
@@ -131,7 +131,6 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
           fullWidth
           describedByIds={['stepLogisticsIndicesDescription']}
         >
-          {/* Fragment needed because EuiFormRow can only have one child: https://github.com/elastic/eui/issues/1931 */}
           <Fragment>
             <EuiSwitch
               label={
@@ -273,7 +272,6 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
           fullWidth
           describedByIds={['stepLogisticsRenameIndicesDescription']}
         >
-          {/* Fragment needed because EuiFormRow can only have one child: https://github.com/elastic/eui/issues/1931 */}
           <Fragment>
             <EuiSwitch
               label={
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
index 81132b76bc83b..49adf302e735d 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
@@ -115,7 +115,6 @@ export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = (
           fullWidth
           describedByIds={['stepSettingsIndexSettingsDescription']}
         >
-          {/* Fragment needed because EuiFormRow can only have one child: https://github.com/elastic/eui/issues/1931 */}
           <Fragment>
             <EuiSwitch
               label={
@@ -227,7 +226,6 @@ export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = (
           fullWidth
           describedByIds={['stepSettingsIgnoreIndexSettingsDescription']}
         >
-          {/* Fragment needed because EuiFormRow can only have one child: https://github.com/elastic/eui/issues/1931 */}
           <Fragment>
             <EuiSwitch
               label={
diff --git a/x-pack/package.json b/x-pack/package.json
index 776fc66f6708f..7021a6ae9df1f 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -169,7 +169,7 @@
     "@babel/register": "7.4.4",
     "@babel/runtime": "7.4.5",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "12.1.0",
+    "@elastic/eui": "12.2.0",
     "@elastic/javascript-typescript-langserver": "^0.2.0",
     "@elastic/lsp-extension": "^0.1.2",
     "@elastic/node-crypto": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index ce25aaeaa5170..55e474abbf2b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1622,10 +1622,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@12.1.0":
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-12.1.0.tgz#bc826bca75035464b2a60582ec0e2d36bd7820e9"
-  integrity sha512-HjIWQNkCFSNHyoU9nSeM+YPs+B1uD7cwRJnZ7Xc8LlBQOWX10nQ8MSdA4RcKdhvFpf5B9fjtfv1Q8/UiOVXP7w==
+"@elastic/eui@12.2.0":
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-12.2.0.tgz#9307c4416e03d28cff88fca886a2c76e261c884a"
+  integrity sha512-0AFbXRpe1NpYbpOnHzjrkiS221wYtcKBRHSl75rtXs70A/aV/QKB3n5rARin6qUdUSjpIghaCumJNMbmvfX7uw==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"