diff --git a/apps/sensenet/src/components/content/Explore.tsx b/apps/sensenet/src/components/content/Explore.tsx
index 5ec9498b9..d624a5031 100644
--- a/apps/sensenet/src/components/content/Explore.tsx
+++ b/apps/sensenet/src/components/content/Explore.tsx
@@ -23,7 +23,7 @@ import { DocumentViewer } from '../document-viewer'
 import { EditBinary } from '../edit/edit-binary'
 import { FullScreenLoader } from '../full-screen-loader'
 import TreeWithData from '../tree/tree-with-data'
-import { BrowseView, EditView, NewView, PermissionView, VersionView } from '../view-controls'
+import { BrowseView, EditView, ImageView, NewView, PermissionView, VersionView } from '../view-controls'
 import WopiPage from '../wopi-page'
 
 const useStyles = makeStyles((theme: Theme) => {
@@ -158,7 +158,7 @@ export function Explore({
       case 'setpermissions':
         return <PermissionView key={activeContent} contentPath={`${rootPath}${activeContent}`} />
       case 'image':
-        return <img src={`${repository.configuration.repositoryUrl}${rootPath}${activeContent}`} alt="" />
+        return <ImageView key={activeContent} contentPath={`${rootPath}${activeContent}`} />
       case 'preview':
         return <DocumentViewer key={activeContent} contentPath={`${rootPath}${activeContent}`} />
       case 'edit-binary':
diff --git a/apps/sensenet/src/components/view-controls/image-view.tsx b/apps/sensenet/src/components/view-controls/image-view.tsx
new file mode 100644
index 000000000..9476f5a8f
--- /dev/null
+++ b/apps/sensenet/src/components/view-controls/image-view.tsx
@@ -0,0 +1,18 @@
+/**
+ * @module ViewControls
+ */
+import { useRepository } from '@sensenet/hooks-react'
+import React, { ReactElement } from 'react'
+
+export interface ImageViewProps {
+  renderIcon?: (name: string) => ReactElement
+  handleCancel?: () => void
+  contentPath: string
+}
+
+export const ImageView: React.FC<ImageViewProps> = (props) => {
+  const { contentPath } = props
+  const repository = useRepository()
+
+  return <img src={`${repository.configuration.repositoryUrl}${contentPath}`} alt="" />
+}
diff --git a/apps/sensenet/src/components/view-controls/index.ts b/apps/sensenet/src/components/view-controls/index.ts
index 9735bd083..f2311af8c 100644
--- a/apps/sensenet/src/components/view-controls/index.ts
+++ b/apps/sensenet/src/components/view-controls/index.ts
@@ -1,5 +1,6 @@
 export * from './browse-view'
 export * from './edit-view'
+export * from './image-view'
 export * from './new-view'
 export * from './permission-view'
 export * from './version-view'