diff --git a/mih_ui/lib/mih_package_components/mih_circle_avatar.dart b/mih_ui/lib/mih_package_components/mih_circle_avatar.dart
index f9369d30..c3d4db1f 100644
--- a/mih_ui/lib/mih_package_components/mih_circle_avatar.dart
+++ b/mih_ui/lib/mih_package_components/mih_circle_avatar.dart
@@ -52,13 +52,16 @@ class _MihCircleAvatarState extends State<MihCircleAvatar> {
         context: context,
         builder: (context) {
           return MihPackageWindow(
-            fullscreen: false,
+            fullscreen: true,
             windowTitle: "",
+            scrollbarOn: false,
             onWindowTapClose: () {
               context.pop();
             },
-            windowBody: InteractiveViewer(
-              child: Image(image: imagePreview!),
+            windowBody: SizedBox.expand(
+              child: InteractiveViewer(
+                child: Image(image: imagePreview!),
+              ),
             ),
           );
         });
diff --git a/mih_ui/lib/mih_package_components/mih_package_window.dart b/mih_ui/lib/mih_package_components/mih_package_window.dart
index cb9afb40..77f6a855 100644
--- a/mih_ui/lib/mih_package_components/mih_package_window.dart
+++ b/mih_ui/lib/mih_package_components/mih_package_window.dart
@@ -15,6 +15,7 @@ class MihPackageWindow extends StatefulWidget {
   final Color? foregroundColor;
   final bool? borderOn;
   final bool fullscreen;
+  final bool? scrollbarOn;
   const MihPackageWindow({
     super.key,
     required this.fullscreen,
@@ -23,6 +24,7 @@ class MihPackageWindow extends StatefulWidget {
     required this.onWindowTapClose,
     required this.windowBody,
     this.borderOn,
+    this.scrollbarOn,
     this.backgroundColor,
     this.foregroundColor,
   });
@@ -177,7 +179,13 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
                     getHeader(),
                     const SizedBox(height: 5),
                     Expanded(
-                        child: SingleChildScrollView(child: widget.windowBody)),
+                      child: widget.scrollbarOn != null || !widget.scrollbarOn!
+                          ? widget.windowBody
+                          : MihSingleChildScroll(
+                              scrollbarOn: true,
+                              child: widget.windowBody,
+                            ),
+                    ),
                   ],
                 )
               : Column(