diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
index 3e280dc0..9756ebb6 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
@@ -98,7 +98,6 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H
         callback.loadDraftIntoViews(draft);
         callback.updateCommentCount(0, board.maxCommentChars, false);
         callback.setCommentHint(getString(loadable.isThreadMode() ? R.string.reply_comment_thread : R.string.reply_comment_board));
-        callback.focusComment();
 
         if (draft.file != null) {
             showPreview(draft.fileName, draft.file);
@@ -413,8 +412,6 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H
 
         void updateCommentCount(int count, int maxCount, boolean over);
 
-        void focusComment();
-
         void openPreview(boolean show, File previewFile);
 
         void openPreviewMessage(boolean show, String message);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
index fbdfbb76..fb81fc27 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
@@ -40,6 +40,7 @@ import org.floens.chan.core.presenter.ReplyPresenter;
 import org.floens.chan.ui.drawable.DropdownArrowDrawable;
 import org.floens.chan.ui.view.LoadView;
 import org.floens.chan.ui.view.SelectionListeningEditText;
+import org.floens.chan.utils.AndroidUtils;
 import org.floens.chan.utils.AnimationUtils;
 import org.floens.chan.utils.ImageDecoder;
 import org.floens.chan.utils.ThemeHelper;
@@ -305,9 +306,14 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
         commentCounter.setTextColor(over ? 0xffff0000 : getAttrColor(getContext(), R.attr.text_color_secondary));
     }
 
-    @Override
     public void focusComment() {
         comment.requestFocus();
+        comment.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                AndroidUtils.requestKeyboardFocus(comment);
+            }
+        }, 100);
     }
 
     @Override
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
index 3ba6d5cc..2840a3af 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
@@ -104,6 +104,9 @@ public class ThreadListLayout extends LinearLayout implements ReplyLayout.ReplyL
         if (showingThread != null && replyOpen != open) {
             this.replyOpen = open;
             AnimationUtils.animateHeight(reply, replyOpen, getWidth(), 500, reply);
+            if (open) {
+                reply.focusComment();
+            }
         }
     }