diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt
index 548b0bed177..9b23040c46b 100644
--- a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt
+++ b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt
@@ -42,7 +42,7 @@ class CommentItem(val comment: Comment,
     private var subCommentIds: MutableList<Int> = mutableListOf()
     val repliesSection = Section()
     private var isEditing = false
-    private var isReplying = false
+    var isReplying = false
     private var repliesVisible = false
     var MAX_DEPTH = 3
 
@@ -201,7 +201,6 @@ class CommentItem(val comment: Comment,
 
     fun replying(isReplying: Boolean) {
         binding?.commentReply?.text = if (isReplying) currActivity()!!.getString(R.string.cancel) else "Reply"
-        PrefManager.setVal(PrefName.ReplyTo, isReplying)
         this.isReplying = isReplying
     }
 
@@ -226,10 +225,6 @@ class CommentItem(val comment: Comment,
         subCommentIds.clear()
     }
 
-    fun test(isEditing: Boolean){
-        this.isEditing = isEditing
-    }
-
     private fun setVoteButtons(viewBinding: ItemCommentsBinding) {
         when (comment.userVoteType) {
             1 -> {
@@ -351,7 +346,7 @@ class CommentItem(val comment: Comment,
      * @param message the message of the dialog
      * @param callback the callback to call when the user clicks yes
      */
-    fun dialogBuilder(title: String, message: String, callback: () -> Unit) {
+    private fun dialogBuilder(title: String, message: String, callback: () -> Unit) {
         val alertDialog = android.app.AlertDialog.Builder(commentsActivity, R.style.MyPopup)
             .setTitle(title)
             .setMessage(message)
diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentsActivity.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentsActivity.kt
index 276cc90a042..b7fb698a66d 100644
--- a/app/src/main/java/ani/dantotsu/media/comments/CommentsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/comments/CommentsActivity.kt
@@ -283,6 +283,7 @@ class CommentsActivity : AppCompatActivity() {
         interactionState = InteractionState.NONE
         return when (oldState) {
             InteractionState.EDIT -> {
+                binding.commentReplyToContainer.visibility = View.GONE
                 binding.commentInput.setText("")
                 val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
                 imm.hideSoftInputFromWindow(binding.commentInput.windowToken, 0)
@@ -337,12 +338,16 @@ class CommentsActivity : AppCompatActivity() {
 
     }
     @SuppressLint("SetTextI18n")
-    fun replyTo(comment: CommentItem,Username: String) {
-        binding.commentReplyToContainer.visibility = if (PrefManager.getVal(PrefName.ReplyTo)) View.VISIBLE else View.GONE
-        binding.commentReplyTo.text = "Replying to $Username"
-        binding.commentReplyToCancel.setOnClickListener {
-            comment.replying(false)
-            replyCallback(comment)
+    fun replyTo(comment: CommentItem, username: String) {
+        if (comment.isReplying) {
+            binding.commentReplyToContainer.visibility = View.VISIBLE
+            binding.commentReplyTo.text = "Replying to $username"
+            binding.commentReplyToCancel.setOnClickListener {
+                comment.replying(false)
+                replyCallback(comment)
+                binding.commentReplyToContainer.visibility = View.GONE
+            }
+        } else {
             binding.commentReplyToContainer.visibility = View.GONE
         }
     }
diff --git a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
index 75ecba3c7f2..728474820b6 100644
--- a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
+++ b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
@@ -154,7 +154,6 @@ enum class PrefName(val data: Pref) {  //TODO: Split this into multiple files
     TagsListNonAdult(Pref(Location.Irrelevant, Set::class, setOf<String>())),
     MakeDefault(Pref(Location.Irrelevant, Boolean::class, true)),
     FirstComment(Pref(Location.Irrelevant, Boolean::class, true)),
-    ReplyTo(Pref(Location.Irrelevant, Boolean::class, false)),
 
     //Protected
     DiscordToken(Pref(Location.Protected, String::class, "")),