diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
index 8e0baabd99..ad603fa321 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
@@ -56,6 +56,7 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
     private Button fav2Button;
     private Button fav3Button;
 
+    private LinearLayout notesLayout;
     private EditText notesEdit;
 
     private static final int FAV1_DEFAULT = 5;
@@ -159,7 +160,9 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
         fav3Button.setOnClickListener(this);
         fav3Button.setText(toSignedString(SP.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT)));
 
-        notesEdit = (EditText) view.findViewById(R.id.newcarbs_notes);
+        notesLayout = view.findViewById(R.id.newcarbs_notes_layout);
+        notesLayout.setVisibility(SP.getBoolean(R.string.key_show_notes_entry_dialogs, false) ? View.VISIBLE : View.GONE);
+        notesEdit = view.findViewById(R.id.newcarbs_notes);
 
         setCancelable(true);
         getDialog().setCanceledOnTouchOutside(false);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 263bc7e090..b988a368fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -105,6 +105,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     NumberPicker editCorr;
     NumberPicker editCarbTime;
 
+    LinearLayout notesLayout;
     EditText notesEdit;
 
     Integer calculatedCarbs = 0;
@@ -209,6 +210,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         superbolus = (TextView) view.findViewById(R.id.treatments_wizard_sb);
         superbolusInsulin = (TextView) view.findViewById(R.id.treatments_wizard_sbinsulin);
 
+        notesLayout = view.findViewById(R.id.treatments_wizard_notes_layout);
+        notesLayout.setVisibility(SP.getBoolean(R.string.key_show_notes_entry_dialogs, false) ? View.VISIBLE : View.GONE);
         notesEdit = (EditText) view.findViewById(R.id.newcarbs_notes);
 
         bgTrend = (TextView) view.findViewById(R.id.treatments_wizard_bgtrend);
diff --git a/app/src/main/res/layout/overview_newcarbs_dialog.xml b/app/src/main/res/layout/overview_newcarbs_dialog.xml
index 8d416467ef..09774fcd08 100644
--- a/app/src/main/res/layout/overview_newcarbs_dialog.xml
+++ b/app/src/main/res/layout/overview_newcarbs_dialog.xml
@@ -237,6 +237,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/newcarbs_notes_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="5dp"
@@ -255,8 +256,7 @@
                 <EditText
                     android:id="@+id/newcarbs_notes"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    />
+                    android:layout_height="wrap_content" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58c4eebc40..c205d0624a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -998,4 +998,6 @@
     <string name="openapssmb_maxiob_title">Maximum total IOB OpenAPS can\'t go over [U]</string>
     <string name="openapssmb_maxiob_summary">This value is called Max IOB in OpenAPS context\nOpenAPS will not add more insulin if current IOB is greater than this value</string>
     <string name="time">Time</string>
+    <string name="key_show_notes_entry_dialogs">show_notes_entry_dialogs</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Show notes field in dialogs</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index aa0a188b31..a3d8245aa8 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -112,5 +112,9 @@
                 android:summary="@string/show_calibration_button_summary"/>
 
         </PreferenceScreen>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_show_notes_entry_dialogs"
+            android:title="@string/overview_show_notes_field_in_dialogs_title" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file