diff --git a/res/layout/fragment_edit_post_content.xml b/res/layout/fragment_edit_post_content.xml
index c68a4c94a659..057e7b9d7f20 100644
--- a/res/layout/fragment_edit_post_content.xml
+++ b/res/layout/fragment_edit_post_content.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:focusableInTouchMode="true">
 
     <ScrollView
         android:layout_width="fill_parent"
diff --git a/src/org/wordpress/android/ui/posts/EditPostContentFragment.java b/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
index 080530cd794c..907d82efb9f2 100644
--- a/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
+++ b/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
@@ -752,11 +752,6 @@ private void addExistingMediaToEditor(String mediaId) {
             AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
             s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             s.insert(selectionEnd + 1, "\n\n");
-            try {
-                mContentEditText.setSelection(s.length());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         }
 
         // load image from server
@@ -934,11 +929,6 @@ private void handleMediaGalleryResult(Intent data) {
         AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
         s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         s.insert(selectionEnd + 1, "\n\n");
-        try {
-            mContentEditText.setSelection(s.length());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     private boolean addMedia(Uri imageUri, SpannableStringBuilder ssb) {
@@ -1017,11 +1007,6 @@ private boolean addMedia(Uri imageUri, SpannableStringBuilder ssb) {
             AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
             s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             s.insert(selectionEnd + 1, "\n\n");
-            try {
-                mContentEditText.setSelection(s.length());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         }
         // Show the soft keyboard after adding media
         if (mActivity != null && !mActivity.getSupportActionBar().isShowing())