diff --git a/src/context/intermediate/modals/Input.tsx b/src/context/intermediate/modals/Input.tsx
index b5897375fd2bc2e8423eb059d169205bfd0e43fc..68e00937736025c8484207dc69d1c09a70248f8b 100644
--- a/src/context/intermediate/modals/Input.tsx
+++ b/src/context/intermediate/modals/Input.tsx
@@ -119,7 +119,7 @@ export function SpecialInputModal(props: SpecialProps) {
                     client.users.editUser({
                         status: {
                             ...client.user?.status,
-                            text
+                            text: text.trim().length > 0 ? text : undefined
                         }
                     })
                 }
diff --git a/src/pages/channels/messaging/MessageEditor.tsx b/src/pages/channels/messaging/MessageEditor.tsx
index b46a10ab2c9899c830474dfd59a818d7613c36fa..e177736cbf1ce32364e83315d95865ba681a1e63 100644
--- a/src/pages/channels/messaging/MessageEditor.tsx
+++ b/src/pages/channels/messaging/MessageEditor.tsx
@@ -1,10 +1,10 @@
 import styled from "styled-components";
-import { useContext, useEffect, useState } from "preact/hooks";
 import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
 import { MessageObject } from "../../../context/revoltjs/util";
+import { useContext, useEffect, useState } from "preact/hooks";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
-import { IntermediateContext } from "../../../context/intermediate/Intermediate";
+import { IntermediateContext, useIntermediate } from "../../../context/intermediate/Intermediate";
 
 const EditorBase = styled.div`
     display: flex;
@@ -40,6 +40,7 @@ interface Props {
 export default function MessageEditor({ message, finish }: Props) {
     const [ content, setContent ] = useState(message.content as string ?? '');
     const { focusTaken } = useContext(IntermediateContext);
+    const { openScreen } = useIntermediate();
     const client = useContext(AppContext);
 
     async function save() {