diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index cddf873ee02b4d..ba0d35a2f2a4c0 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -396,9 +396,11 @@ export class ImageEdit extends React.Component {
const editImageComponent = ( { open, mediaOptions } ) => (
-
- { mediaOptions() }
-
+
+
+ { mediaOptions() }
+
+
);
@@ -492,7 +494,8 @@ export class ImageEdit extends React.Component {
{ retryMessage }
) }
- { ! isUploadInProgress &&
+ { isSelected &&
+ ! isUploadInProgress &&
! isUploadFailed &&
finalWidth &&
finalHeight &&
diff --git a/packages/block-library/src/image/icon-customize.native.js b/packages/block-library/src/image/icon-customize.native.js
index d455d3508ebc8a..57fc39c7c29f1b 100644
--- a/packages/block-library/src/image/icon-customize.native.js
+++ b/packages/block-library/src/image/icon-customize.native.js
@@ -4,7 +4,7 @@
import { Path, SVG } from '@wordpress/components';
export default (
-