diff --git a/Memola/Features/Memo/ElementToolbar/ElementToolbar.swift b/Memola/Features/Memo/ElementToolbar/ElementToolbar.swift
index 9d9047d..d3c62a3 100644
--- a/Memola/Features/Memo/ElementToolbar/ElementToolbar.swift
+++ b/Memola/Features/Memo/ElementToolbar/ElementToolbar.swift
@@ -34,6 +34,7 @@ struct ElementToolbar: View {
                                     .fill(.regularMaterial)
                             }
                             .padding(.bottom, 10)
+                            .frame(maxWidth: .infinity)
                             .transition(.move(edge: .bottom).combined(with: .blurReplace))
                     } else {
                         compactToolbar
@@ -196,6 +197,7 @@ struct ElementToolbar: View {
                 .fill(.regularMaterial)
         }
         .padding(10)
+        .frame(maxWidth: .infinity)
         .transition(.move(edge: .bottom).combined(with: .blurReplace))
     }
 
diff --git a/Memola/Features/Memo/Memo/MemoView.swift b/Memola/Features/Memo/Memo/MemoView.swift
index 47dbb68..722e431 100644
--- a/Memola/Features/Memo/Memo/MemoView.swift
+++ b/Memola/Features/Memo/Memo/MemoView.swift
@@ -92,6 +92,7 @@ struct MemoView: View {
                 case .photo:
                     if let photoItem = tool.selectedPhotoItem {
                         PhotoPreview(photoItem: photoItem, tool: tool)
+                            .frame(maxWidth: .infinity, alignment: .trailing)
                             .transition(.move(edge: .trailing))
                     }
                 default:
diff --git a/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift b/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift
index 16e7399..beb923e 100644
--- a/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift
+++ b/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift
@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct PhotoPreview: View {
+    @Environment(\.horizontalSizeClass) var horizontalSizeClass
+
     let photoItem: PhotoItem
     @ObservedObject var tool: Tool
 
@@ -15,7 +17,7 @@ struct PhotoPreview: View {
         Image(uiImage: photoItem.previewImage)
             .resizable()
             .scaledToFit()
-            .frame(height: 100)
+            .frame(width: horizontalSizeClass == .compact ? 80 : nil, height: horizontalSizeClass == .compact ? nil : 100)
             .cornerRadius(5)
             .overlay {
                 RoundedRectangle(cornerRadius: 5)