diff --git a/css/publicshareauth.scss b/css/publicshareauth.scss
index 9d2772facd5..6b0790d2d40 100644
--- a/css/publicshareauth.scss
+++ b/css/publicshareauth.scss
@@ -226,3 +226,15 @@ input#request-password-button:disabled ~ .icon {
 	width: unset;
 	margin: 0;
 }
+
+/* Unset conflicting rules from publicshareauth.css (core) for the sidebar */
+#talk-sidebar input[type="submit"],
+#talk-sidebar input.icon-confirm[type="submit"] {
+	top: unset;
+}
+
+/* Unset conflicting rules from guest.css for the sidebar */
+#talk-sidebar input[type="submit"].hidden,
+#talk-sidebar input.icon-confirm[type="submit"].hidden {
+	display: none;
+}