diff --git a/src/qml/Pages/EditAccount/EditAccount.qml b/src/qml/Pages/EditAccount/EditAccount.qml
index 591bb58a..16e0b7f7 100644
--- a/src/qml/Pages/EditAccount/EditAccount.qml
+++ b/src/qml/Pages/EditAccount/EditAccount.qml
@@ -64,6 +64,7 @@ Page {
         clip: true
         contentWidth: parent.width
         contentHeight: boxColumn.childrenRect.height
+        interactive: contentWidth > width || contentHeight > height
 
         HColumnLayout {
             id: boxColumn
diff --git a/src/qml/Pages/EditAccount/Profile.qml b/src/qml/Pages/EditAccount/Profile.qml
index 07153ed1..20b768c3 100644
--- a/src/qml/Pages/EditAccount/Profile.qml
+++ b/src/qml/Pages/EditAccount/Profile.qml
@@ -48,8 +48,7 @@ HGridLayout {
 
         Layout.alignment: Qt.AlignHCenter
 
-        Layout.preferredWidth:
-            Math.min(flickable.height, theme.minimumSupportedWidth)
+        Layout.preferredWidth: Math.min(flickable.height, avatarPreferredSize)
         Layout.preferredHeight: Layout.preferredWidth
 
         HFileDialogOpener {