diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index 34ff622..bb812c6 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -109,15 +109,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
                 super.onDrawerOpened(view);
                 // This closes the soft keyboard, when the drawer is opened
                 try {
-                    InputMethodManager imm = (InputMethodManager) getSystemService(
-                            Context.INPUT_METHOD_SERVICE);
-                    if (getCurrentSection() == writtenMorse) {
-                        EditText myEditText = (EditText) findViewById(R.id.editTextWrittenMorse);
-                        imm.hideSoftInputFromWindow(myEditText.getWindowToken(), 0);
-                    } else if (getCurrentSection() == normalMorse) {
-                        EditText myEditText = (EditText) findViewById(R.id.editTextNormalMorse);
-                        imm.hideSoftInputFromWindow(myEditText.getWindowToken(), 0);
-                    }
+                    closeKeyboard();
                 } catch (Exception e){
                     e.printStackTrace();
                 }
@@ -174,6 +166,18 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
         super.onDestroy();
     }
 
+    public void closeKeyboard(){
+        InputMethodManager imm = (InputMethodManager) getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        if (getCurrentSection() == writtenMorse) {
+            EditText myEditText = (EditText) findViewById(R.id.editTextWrittenMorse);
+            imm.hideSoftInputFromWindow(myEditText.getWindowToken(), 0);
+        } else if (getCurrentSection() == normalMorse) {
+            EditText myEditText = (EditText) findViewById(R.id.editTextNormalMorse);
+            imm.hideSoftInputFromWindow(myEditText.getWindowToken(), 0);
+        }
+    }
+
     public void normalMorseEncode(View view){
         try{
             EditText input = (EditText) findViewById(R.id.editTextNormalMorse);
@@ -183,6 +187,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
                 cardView.setVisibility(View.VISIBLE);
             }
             output.setText(EncodeNormalMorseManager.getEncodedString(input.getText().toString()));
+            closeKeyboard();
         } catch (Exception e){
             e.printStackTrace();
         }
@@ -197,7 +202,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
                 cardView.setVisibility(View.VISIBLE);
             }
             output.setText(DecodeNormalMorseManager.getDecodedString(input.getText().toString()));
-
+            closeKeyboard();
         } catch (Exception e){
             e.printStackTrace();
         }
@@ -212,6 +217,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
                 cardView.setVisibility(View.VISIBLE);
             }
             output.setText(EncodeWrittenMorseManager.getEncodedString(input.getText().toString()));
+            closeKeyboard();
         } catch (Exception e){
             e.printStackTrace();
         }
@@ -226,6 +232,7 @@ public class MainActivity extends MaterialNavigationDrawer implements BillingPro
                 cardView.setVisibility(View.VISIBLE);
             }
             output.setText(DecodeWrittenMorseManager.getDecodedString(input.getText().toString()));
+            closeKeyboard();
         } catch (Exception e){
             e.printStackTrace();
         }
diff --git a/app/src/main/res/layout-large-land/fragment_main.xml b/app/src/main/res/layout-large-land/fragment_main.xml
index d28e1df..00e537b 100644
--- a/app/src/main/res/layout-large-land/fragment_main.xml
+++ b/app/src/main/res/layout-large-land/fragment_main.xml
@@ -70,8 +70,7 @@
                 android:scrollbars="vertical"
                 android:minLines="5"
                 android:singleLine="false"
-                android:background="@color/cardview_light_background"
-                android:textCursorDrawable="@color/colorPrimary"/>
+                android:background="@color/cardview_light_background"/>
 
             <View
                 style="@style/Divider"
diff --git a/app/src/main/res/layout-large-land/fragment_morse.xml b/app/src/main/res/layout-large-land/fragment_morse.xml
index 72360a6..c8fc6b1 100644
--- a/app/src/main/res/layout-large-land/fragment_morse.xml
+++ b/app/src/main/res/layout-large-land/fragment_morse.xml
@@ -70,8 +70,7 @@
                 android:ems="10"
                 android:hint="@string/edit_message"
                 android:background="@color/cardview_light_background"
-                android:minLines="5"
-                android:textCursorDrawable="@color/colorPrimary">
+                android:minLines="5">
             </EditText>
 
             <View
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index b892e17..9b964ad 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -69,8 +69,7 @@
                 android:scrollbars="vertical"
                 android:minLines="5"
                 android:singleLine="false"
-                android:background="@color/cardview_light_background"
-                android:textCursorDrawable="@color/colorPrimary"/>
+                android:background="@color/cardview_light_background"/>
 
             <View
                 style="@style/Divider"
diff --git a/app/src/main/res/layout/fragment_morse.xml b/app/src/main/res/layout/fragment_morse.xml
index 24b6b4e..a366c08 100644
--- a/app/src/main/res/layout/fragment_morse.xml
+++ b/app/src/main/res/layout/fragment_morse.xml
@@ -69,8 +69,7 @@
                 android:ems="10"
                 android:hint="@string/edit_message"
                 android:background="@color/cardview_light_background"
-                android:minLines="5"
-                android:textCursorDrawable="@color/colorPrimary">
+                android:minLines="5">
             </EditText>
 
             <View