diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 46d522b5c558cfc55e4a3f4a1d38b4ab26087852..23b934d28ff91a6c51f3d1a65693649a4e8cb0e3 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -523,6 +523,9 @@ Window {
 
     AboutPopUp {
         id: aboutPopUpDialog
+
+        height: Math.min(preferredHeight,
+                         mainViewWindow.height - JamiTheme.preferredMarginSize * 2)
     }
 
     WelcomePageQrDialog {
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index 4ede1ea0919a71d10ee966f82111231c4faa06a2..0dcb664816dddcc38671c2ea7214c7054249052a 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -25,12 +25,10 @@ import net.jami.Adapters 1.0
 import "../../constant"
 import "../../commoncomponents"
 
-BaseDialog {
+ModalPopup {
     id: root
 
-    height: aboutPopUpContentRectColumnLayout.implicitHeight
-
-    title: qsTr("About")
+    property alias preferredHeight: aboutPopUpContentRectColumnLayout.implicitHeight
 
     ProjectCreditsScrollView {
         id: projectCreditsScrollView
@@ -70,13 +68,13 @@ BaseDialog {
 
                     Layout.alignment: Qt.AlignCenter
 
-                    ResponsiveImage {
+                    Image {
                         id: aboutPopUPJamiLogoImage
 
                         Layout.alignment: Qt.AlignCenter
                         Layout.topMargin: JamiTheme.preferredMarginSize
-                        Layout.preferredWidth: contentRect.width
-                        Layout.preferredHeight: 100
+                        Layout.preferredWidth: 250
+                        Layout.preferredHeight: 88
 
                         smooth: true
                         antialiasing: true
@@ -289,7 +287,7 @@ BaseDialog {
 
                         Layout.alignment: Qt.AlignCenter
                         Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2
-                        Layout.preferredHeight: 150
+                        Layout.preferredHeight: 128
                         Layout.margins: JamiTheme.preferredMarginSize
 
                         initialItem: changeLogScrollView
diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml
index 32170d1d4edaaa4a563aff7a660f4915d8f138de..ad1389a1a91fe7ebc795208b4057f0079f3b2ada 100644
--- a/src/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/mainview/components/ProjectCreditsScrollView.qml
@@ -41,7 +41,7 @@ ScrollView {
         readOnly: true
         wrapMode: Text.WordWrap
 
-        font.pointSize: JamiTheme.textFontSize - 3
+        font.pointSize: JamiTheme.textFontSize
         text: UtilsAdapter.getProjectCredits()
         textFormat: TextEdit.RichText