diff --git a/app/assets/javascripts/discourse/app/lib/user-tips.js b/app/assets/javascripts/discourse/app/lib/user-tips.js
index df27654a90..9e51f37033 100644
--- a/app/assets/javascripts/discourse/app/lib/user-tips.js
+++ b/app/assets/javascripts/discourse/app/lib/user-tips.js
@@ -24,6 +24,7 @@ export function showUserTip(options) {
     hideOnClick: false,
     trigger: "manual",
     theme: "user-tips",
+    zIndex: 399, // Composer z-index is 400
 
     // It must be interactive to make buttons work.
     interactive: true,