diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
index c4aba7004a..abf7c1beb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
@@ -148,6 +148,11 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
 
         setCancelable(true);
         getDialog().setCanceledOnTouchOutside(false);
+        if (savedInstanceState != null) {
+//            log.debug("savedInstanceState in onCreate is:" + savedInstanceState.toString());
+            editInsulin.setValue(savedInstanceState.getDouble("editInsulin"));
+            editTime.setValue(savedInstanceState.getDouble("editTime"));
+        }
         return view;
     }
 
@@ -156,6 +161,17 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
         return value > 0 ? "+" + formatted : formatted;
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle insulinDialogState) {
+        insulinDialogState.putBoolean("startEatingSoonTTCheckbox", startEatingSoonTTCheckbox.isChecked());
+        insulinDialogState.putBoolean("recordOnlyCheckbox", recordOnlyCheckbox.isChecked());
+        insulinDialogState.putDouble("editTime", editTime.getValue());
+        insulinDialogState.putDouble("editInsulin", editInsulin.getValue());
+        insulinDialogState.putString("notesEdit",notesEdit.getText().toString());
+        log.debug("Instance state saved:"+insulinDialogState.toString());
+        super.onSaveInstanceState(insulinDialogState);
+    }
+
     @Override
     public synchronized void onClick(View view) {
         switch (view.getId()) {