diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28f2c331..f94b5f24 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -128,7 +128,7 @@
             android:name=".media.MediaDetailsActivity"
             android:parentActivityName=".MainActivity"
             android:theme="@style/Theme.Dantotsu.NeverCutout"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+            android:windowSoftInputMode="adjustResize|stateHidden"/>
         <activity android:name=".media.CharacterDetailsActivity" />
         <activity android:name=".home.NoInternet" />
         <activity
diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
index 05ed9bc9..3e40b5c0 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
@@ -60,7 +60,7 @@ import kotlin.math.abs
 
 class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListener {
 
-    private lateinit var binding: ActivityMediaBinding
+    lateinit var binding: ActivityMediaBinding
     private val scope = lifecycleScope
     private val model: MediaDetailsViewModel by viewModels()
     private lateinit var tabLayout: NavigationBarView
diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
index 23d81d99..7947740d 100644
--- a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
@@ -27,6 +27,7 @@ import ani.dantotsu.connections.comments.CommentResponse
 import ani.dantotsu.connections.comments.CommentsAPI
 import ani.dantotsu.databinding.FragmentCommentsBinding
 import ani.dantotsu.loadImage
+import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
@@ -85,6 +86,7 @@ class CommentsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         activity = requireActivity() as AppCompatActivity
+        (activity as? MediaDetailsActivity)?.binding?.mediaAppBar?.setExpanded(false, true)
         //get the media id from the intent
         val mediaId = arguments?.getInt("mediaId") ?: -1
         mediaName = arguments?.getString("mediaName") ?: "unknown"
@@ -349,6 +351,7 @@ class CommentsFragment : Fragment() {
         super.onResume()
         tag = null
         adapter.notifyDataSetChanged()
+        (activity as? MediaDetailsActivity)?.binding?.mediaAppBar?.setExpanded(false, true)
     }
 
     enum class InteractionState {
diff --git a/app/src/main/res/layout/fragment_comments.xml b/app/src/main/res/layout/fragment_comments.xml
index e1cbfd04..dbfdb6a7 100644
--- a/app/src/main/res/layout/fragment_comments.xml
+++ b/app/src/main/res/layout/fragment_comments.xml
@@ -8,9 +8,11 @@
     android:background="?android:colorBackground"
     android:fitsSystemWindows="true">
 
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/commentsRefresh"
         android:layout_width="match_parent"
+        android:layout_marginTop="58dp"
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false">
@@ -20,69 +22,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/commentInputLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:windowSoftInputMode="adjustResize">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/commentUserAvatar"
-                    style="@style/CircularImageView"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
-                    android:layout_marginStart="12dp"
-                    android:scaleType="center"
-                    app:srcCompat="@drawable/ic_round_add_circle_24"
-                    tools:ignore="ContentDescription,ImageContrastCheck" />
-
-                <EditText
-                    android:id="@+id/commentInput"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_weight="1"
-                    android:layout_gravity="start|center_vertical"
-                    android:autofillHints="The One Piece is real"
-                    android:background="@drawable/card_outline"
-                    android:fontFamily="@font/poppins_semi_bold"
-                    android:hint="Add a comment..."
-                    android:inputType="textMultiLine"
-                    android:maxLength="300"
-                    android:maxLines="8"
-                    android:padding="8dp"
-                    android:textSize="12sp"
-                    tools:ignore="HardcodedText" />
-
-                <ImageButton
-                    android:id="@+id/commentLabel"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
-                    android:scaleType="center"
-                    android:scaleX="0.6"
-                    android:scaleY="0.6"
-                    android:translationX="100dp"
-                    android:background="@drawable/ic_label_off_24"
-                    android:visibility="gone"/>
-
-                <ImageButton
-                    android:id="@+id/commentSend"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
-                    android:layout_marginEnd="12dp"
-                    android:translationX="100dp"
-                    android:scaleType="center"
-                    android:scaleX="0.85"
-                    android:scaleY="0.85"
-                    android:background="@drawable/ic_round_send_24"
-                    tools:ignore="ContentDescription"
-                    android:visibility="gone"/>
-            </LinearLayout>
-
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -145,6 +84,70 @@
         </LinearLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <LinearLayout
+        android:id="@+id/commentInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:windowSoftInputMode="adjustResize">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/commentUserAvatar"
+            style="@style/CircularImageView"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginStart="12dp"
+            android:scaleType="center"
+            app:srcCompat="@drawable/ic_round_add_circle_24"
+            tools:ignore="ContentDescription,ImageContrastCheck" />
+
+        <EditText
+            android:id="@+id/commentInput"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:layout_gravity="start|center_vertical"
+            android:autofillHints="The One Piece is real"
+            android:background="@drawable/card_outline"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:hint="Add a comment..."
+            android:inputType="textMultiLine"
+            android:maxLength="300"
+            android:maxLines="8"
+            android:padding="8dp"
+            android:textSize="12sp"
+            tools:ignore="HardcodedText" />
+
+        <ImageButton
+            android:id="@+id/commentLabel"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:scaleType="center"
+            android:scaleX="0.6"
+            android:scaleY="0.6"
+            android:translationX="100dp"
+            android:background="@drawable/ic_label_off_24"
+            android:visibility="gone"/>
+
+        <ImageButton
+            android:id="@+id/commentSend"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginEnd="12dp"
+            android:translationX="100dp"
+            android:scaleType="center"
+            android:scaleX="0.85"
+            android:scaleY="0.85"
+            android:background="@drawable/ic_round_send_24"
+            tools:ignore="ContentDescription"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"