diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dfb568..8445c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.0.1-SNAPSHOT] - 2021-11-10
+
+#### Fixes
+
+- [#22370] Use a max-height for preview image shown in the pop-up
+
 ## [v2.0.0] - 2021-07-30
 
 #### Enhancements
@@ -17,7 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - [#22041] Files have been ported to FileSet model
 - [#21991] Implemented the Layer Switcher
 
-## [v1.2.0-SNAPSHOT] - 2021-07-19
+## [v1.2.0] - 2021-07-19
 
 #### Enhancements
 
diff --git a/pom.xml b/pom.xml
index acc10fe..37f0735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-viewer-app</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.0</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>GeoPortal Data Viewer App</name>
 	<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
index 7998f93..6da5938 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java
@@ -754,7 +754,7 @@ public class LayerManager {
 					UploadedImageDV img = listUI.get(0);
 					if (img.getListWsContent() != null) {
 						WorkspaceContentDV wsContent = img.getListWsContent().get(img.getListWsContent().size() - 1);
-						String theImgHTML = "<img src=\"" + wsContent.getLink() + "\"></img>";
+						String theImgHTML = "<img class='popup-img-preview' src=\"" + wsContent.getLink() + "\"></img>";
 						GWT.log("theImgHTML: " + theImgHTML);
 						// GeoportalDataViewerConstants.print("The row are:
 						// "+flex.getRowCount());
diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css
index 0ad73b0..5712fee 100644
--- a/src/main/webapp/GeoportalDataViewer.css
+++ b/src/main/webapp/GeoportalDataViewer.css
@@ -83,6 +83,10 @@ body {
 	font-weight: bold;
 }
 
+.popup-img-preview{
+	max-height: 200px;
+}
+
 #page-view-details {
 	margin: 10px;
 	text-rendering: optimizelegibility;