diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
index c9df126b89..c5757ee3f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareConstraintLayout.kt
@@ -67,7 +67,7 @@ class InputAwareConstraintLayout @JvmOverloads constructor(
           removeKeyboardStateListener(this)
         }
 
-        override fun onInputShown() = Unit
+        override fun onInputShown(fragmentCreatorId: Int) = Unit
         override fun onKeyboardShown() = Unit
       }
 
@@ -120,7 +120,7 @@ class InputAwareConstraintLayout @JvmOverloads constructor(
     overrideKeyboardGuidelineWithPreviousHeight()
     ViewUtil.hideKeyboard(context, imeTarget)
 
-    listeners.forEach { it.onInputShown() }
+    listeners.forEach { it.onInputShown(fragmentCreator.id) }
   }
 
   private fun hideInput(resetKeyboardGuideline: Boolean) {
@@ -152,7 +152,7 @@ class InputAwareConstraintLayout @JvmOverloads constructor(
   }
 
   interface Listener {
-    fun onInputShown()
+    fun onInputShown(fragmentCreatorId: Int)
     fun onInputHidden()
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java
index 68eeb4eb81..ad4bd0e351 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -160,9 +161,9 @@ public class AttachmentKeyboard extends FrameLayout implements InputAwareLayout.
 
   public void setWallpaperEnabled(boolean wallpaperEnabled) {
     if (wallpaperEnabled) {
-      container.setBackgroundColor(getContext().getResources().getColor(R.color.wallpaper_compose_background));
+      container.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.wallpaper_compose_background));
     } else {
-      container.setBackgroundColor(getContext().getResources().getColor(R.color.signal_background_primary));
+      container.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_primary));
     }
     buttonAdapter.setWallpaperEnabled(wallpaperEnabled);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 66bead5735..1cfe8bcd28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -413,6 +413,9 @@ class ConversationFragment :
     private const val SCROLL_HEADER_ANIMATION_DURATION: Long = 100L
     private const val SCROLL_HEADER_CLOSE_DELAY: Long = SCROLL_HEADER_ANIMATION_DURATION * 4
     private const val IS_SCROLLED_TO_BOTTOM_THRESHOLD: Int = 2
+
+    private const val ATTACHMENT_KEYBOARD_FRAGMENT_CREATOR_ID = 1
+    private const val MEDIA_KEYBOARD_FRAGMENT_CREATOR_ID = 2
   }
 
   private val args: ConversationArgs by lazy {
@@ -4514,7 +4517,7 @@ class ConversationFragment :
   }
 
   private object AttachmentKeyboardFragmentCreator : InputAwareConstraintLayout.FragmentCreator {
-    override val id: Int = 1
+    override val id: Int = ATTACHMENT_KEYBOARD_FRAGMENT_CREATOR_ID
     override fun create(): Fragment = AttachmentKeyboardFragment()
   }
 
@@ -4553,7 +4556,7 @@ class ConversationFragment :
   }
 
   private object MediaKeyboardFragmentCreator : InputAwareConstraintLayout.FragmentCreator {
-    override val id: Int = 2
+    override val id: Int = MEDIA_KEYBOARD_FRAGMENT_CREATOR_ID
     override fun create(): Fragment = KeyboardPagerFragment().apply {
       arguments = bundleOf(KeyboardPagerFragment.ARG_SET_NAV_COLOR to false)
     }
@@ -4563,8 +4566,23 @@ class ConversationFragment :
     InputAwareConstraintLayout.Listener,
     InsetAwareConstraintLayout.KeyboardStateListener {
 
-    override fun onInputShown() {
-      binding.navBar.setBackgroundColor(ThemeUtil.getThemedColor(requireContext(), R.attr.mediaKeyboardBottomBarBackgroundColor))
+    override fun onInputShown(fragmentCreatorId: Int) {
+      when (fragmentCreatorId) {
+        ATTACHMENT_KEYBOARD_FRAGMENT_CREATOR_ID -> {
+          if (viewModel.recipientSnapshot?.wallpaper != null) {
+            binding.navBar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.wallpaper_compose_background))
+          } else {
+            binding.navBar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.signal_background_primary))
+          }
+        }
+        MEDIA_KEYBOARD_FRAGMENT_CREATOR_ID -> {
+          binding.navBar.setBackgroundColor(ThemeUtil.getThemedColor(requireContext(), R.attr.mediaKeyboardBottomBarBackgroundColor))
+        }
+        else -> {
+          Log.w(TAG, "Not setting navbar coloring for unknown creator id $fragmentCreatorId")
+        }
+      }
+
       viewModel.setIsMediaKeyboardShowing(true)
     }