diff --git a/Vernissage/Widgets/ImageViewer.swift b/Vernissage/Widgets/ImageViewer.swift
index 14822cd..d532ba3 100644
--- a/Vernissage/Widgets/ImageViewer.swift
+++ b/Vernissage/Widgets/ImageViewer.swift
@@ -156,6 +156,8 @@ struct ImageViewer: View {
     var tapGesture: some Gesture {
         TapGesture().onEnded({ _ in
             withAnimation {
+                self.currentMagnification = 0
+                self.finalMagnification = 1.0
                 self.currentOffset = self.calculateStartingOffset()
             }
 
diff --git a/WidgetsKit/Sources/WidgetsKit/Views/BaseComposeView.swift b/WidgetsKit/Sources/WidgetsKit/Views/BaseComposeView.swift
index 36dcf9d..ae4bdb4 100644
--- a/WidgetsKit/Sources/WidgetsKit/Views/BaseComposeView.swift
+++ b/WidgetsKit/Sources/WidgetsKit/Views/BaseComposeView.swift
@@ -18,7 +18,7 @@ public struct BaseComposeView: View {
 
     @StateObject private var textModel: TextModel
 
-    @State private var isKeyboardPresented = false
+    @State private var isKeyboardPresented = true
     @State private var isSensitive = false
     @State private var spoilerText = ""
     @State private var commentsDisabled = false