diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c267042ac..15e5b0a2ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -202,7 +202,7 @@
             android:parentActivityName=".MainActivity" />
         <activity
             android:name=".util.ActivityMarkdownCreator"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity android:name=".parsers.ParserTestActivity" />
         <activity
             android:name=".media.ReviewActivity"
diff --git a/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt b/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
index ccddfbab33..fdc2493769 100644
--- a/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
+++ b/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
@@ -5,7 +5,6 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.updateLayoutParams
 import androidx.core.widget.addTextChangedListener
@@ -16,6 +15,7 @@ import ani.dantotsu.databinding.ActivityMarkdownCreatorBinding
 import ani.dantotsu.initActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.openLinkInBrowser
+import ani.dantotsu.others.AndroidBug5497Workaround
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.toast
@@ -42,7 +42,7 @@ class ActivityMarkdownCreator : AppCompatActivity() {
         BOLD("****", 2, R.id.formatBold),
         ITALIC("**", 1, R.id.formatItalic),
         STRIKETHROUGH("~~~~", 2, R.id.formatStrikethrough),
-        SPOILER("||", 2, R.id.formatSpoiler),
+        SPOILER("~||~", 2, R.id.formatSpoiler),
         LINK("[Placeholder](%s)", 0, R.id.formatLink),
         IMAGE("img(%s)", 0, R.id.formatImage),
         YOUTUBE("youtube(%s)", 0, R.id.formatYoutube),
@@ -68,6 +68,7 @@ class ActivityMarkdownCreator : AppCompatActivity() {
             bottomMargin += navBarHeight
         }
         setContentView(binding.root)
+        AndroidBug5497Workaround.assistActivity(this) {}
 
         val params = binding.createButton.layoutParams as ViewGroup.MarginLayoutParams
         params.marginEnd = 16 * resources.displayMetrics.density.toInt()