diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
index bb9f68647cf6..d5540d050227 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
@@ -7,6 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
+  EuiForm,
   EuiFlexGroup,
   EuiFlexItem,
   EuiImage,
@@ -15,7 +16,10 @@ import {
   EuiButton,
   EuiFieldText,
 } from '@elastic/eui';
-import { Loading } from '../../../../public/components/loading';
+
+// TODO: (clintandrewhall) This is a quick fix for #25342 -- we should figure out how to use the overall component.
+import { Loading } from '../../../../public/components/loading/loading';
+
 import { FileUpload } from '../../../../public/components/file_upload';
 import { elasticOutline } from '../../../lib/elastic_outline';
 import { resolveFromArgs } from '../../../../common/lib/resolve_dataurl';
@@ -123,18 +127,19 @@ class ImageUpload extends React.Component {
     }
 
     const pasteImageUrl = urlTypeSrc ? (
-      <form onSubmit={this.setSrcUrl} className="eui-textRight">
+      <EuiForm onSubmit={this.setSrcUrl} className="eui-textRight">
         <EuiFieldText
           compressed
-          value={this.state.url}
+          defaultValue={this.state.url}
           inputRef={ref => (this.inputRefs.srcUrlText = ref)}
           placeholder="Image URL"
           aria-label="Image URL"
         />
+        <EuiSpacer size="m" />
         <EuiButton type="submit" size="s" onClick={this.setSrcUrl}>
           Set
         </EuiButton>
-      </form>
+      </EuiForm>
     ) : null;
 
     const shouldPreview =