diff --git a/android/res/layout/fragment_timetable.xml b/android/res/layout/fragment_timetable.xml
index 495683f36d..54ec66e3d2 100644
--- a/android/res/layout/fragment_timetable.xml
+++ b/android/res/layout/fragment_timetable.xml
@@ -2,7 +2,8 @@
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
 
   <FrameLayout
     android:id="@+id/fragment_container"
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 6e26cdcf92..1ad508986c 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -71,12 +71,10 @@
 
   <style name="MwmTheme.EditorActivity">
     <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
-    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
   </style>
 
   <style name="MwmTheme.Night.EditorActivity">
     <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
-    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
   </style>
 
   <style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
diff --git a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java
index f7b52bbca0..94b4b98e88 100644
--- a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java
+++ b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java
@@ -4,6 +4,8 @@ import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,21 +15,22 @@ import android.widget.TextView;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragment;
-import com.mapswithme.maps.editor.data.Timetable;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.Graphics;
+import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.UiUtils;
 
 public class AdvancedTimetableFragment extends BaseMwmFragment
-                                    implements View.OnClickListener,
-                                               TimetableProvider
+                                       implements View.OnClickListener, TimetableProvider
 {
   private boolean mIsExampleShown;
   private EditText mInput;
   private WebView mExample;
+  private TextView mExamplesTitle;
   @Nullable
   private String mInitTimetables;
-  private TextView mExamplesTitle;
+  @Nullable
+  TimetableChangedListener mListener;
 
   @Nullable
   @Override
@@ -60,6 +63,7 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
     mExample.loadUrl(Constants.Url.OPENING_HOURS_MANUAL);
     mExamplesTitle = (TextView) view.findViewById(R.id.tv__examples_title);
     setExampleDrawables(R.drawable.ic_type_text, R.drawable.ic_expand_more);
+    setTextChangedListener(mInput, mListener);
   }
 
   private void showExample(boolean show)
@@ -93,6 +97,7 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
     }
   }
 
+  @Nullable
   @Override
   public String getTimetables()
   {
@@ -108,7 +113,39 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
 
   private void refreshTimetables()
   {
-    if (mInput != null && mInitTimetables != null)
-      mInput.setText(mInitTimetables);
+    if (mInput == null || mInitTimetables == null)
+      return;
+
+    mInput.setText(mInitTimetables);
+    mInput.requestFocus();
+    InputUtils.showKeyboard(mInput);
+  }
+
+  void setTimetableChangedListener(@NonNull TimetableChangedListener listener)
+  {
+    mListener = listener;
+    setTextChangedListener(mInput, mListener);
+  }
+
+  private static void setTextChangedListener(@Nullable EditText input,
+                                             @Nullable TimetableChangedListener listener)
+  {
+    if (input == null || listener == null)
+      return;
+
+    input.addTextChangedListener(new TextWatcher()
+    {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+      @Override
+      public void afterTextChanged(Editable s)
+      {
+        listener.onTimetableChanged(s.toString());
+      }
+    });
   }
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorActivity.java b/android/src/com/mapswithme/maps/editor/EditorActivity.java
index 2661b5b1b4..4795345375 100644
--- a/android/src/com/mapswithme/maps/editor/EditorActivity.java
+++ b/android/src/com/mapswithme/maps/editor/EditorActivity.java
@@ -3,9 +3,12 @@ package com.mapswithme.maps.editor;
 import android.app.Activity;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.Fragment;
 
+import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
+import com.mapswithme.util.ThemeUtils;
 
 public class EditorActivity extends BaseMwmFragmentActivity
 {
@@ -22,4 +25,17 @@ public class EditorActivity extends BaseMwmFragmentActivity
     final Intent intent = new Intent(activity, EditorActivity.class);
     activity.startActivity(intent);
   }
+
+  @Override
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
+  {
+    if (ThemeUtils.isDefaultTheme(theme))
+      return R.style.MwmTheme_EditorActivity;
+
+    if (ThemeUtils.isNightTheme(theme))
+      return R.style.MwmTheme_Night_EditorActivity;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java
index 9fc6efe07f..5e62fea92a 100644
--- a/android/src/com/mapswithme/maps/editor/EditorFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java
@@ -337,16 +337,19 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void refreshOpeningTime()
   {
-    final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(Editor.nativeGetOpeningHours());
-    if (timetables == null)
+    final String openingHours = Editor.nativeGetOpeningHours();
+    if (TextUtils.isEmpty(openingHours) || !OpeningHours.nativeIsTimetableStringValid(openingHours))
     {
       UiUtils.show(mEmptyOpeningHours);
       UiUtils.hide(mOpeningHours, mEditOpeningHours);
     }
     else
     {
+      final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(openingHours);
+      String content = timetables == null ? openingHours
+                                          : TimeFormatUtils.formatTimetables(timetables);
       UiUtils.hide(mEmptyOpeningHours);
-      UiUtils.setTextAndShow(mOpeningHours, TimeFormatUtils.formatTimetables(timetables));
+      UiUtils.setTextAndShow(mOpeningHours, content);
       UiUtils.show(mEditOpeningHours);
     }
   }
diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java
index 3b625d11ee..d8c1d5702d 100644
--- a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java
+++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java
@@ -66,6 +66,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
     notifyDataSetChanged();
   }
 
+  @Nullable
   @Override
   public String getTimetables()
   {
diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
index 840ef8b4ba..19fc385306 100644
--- a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
+++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
@@ -47,6 +47,7 @@ public class SimpleTimetableFragment extends BaseMwmRecyclerFragment<SimpleTimet
     super.onViewCreated(view, savedInstanceState);
   }
 
+  @Nullable
   @Override
   public String getTimetables()
   {
@@ -54,7 +55,7 @@ public class SimpleTimetableFragment extends BaseMwmRecyclerFragment<SimpleTimet
   }
 
   @Override
-  public void setTimetables(String timetables)
+  public void setTimetables(@Nullable String timetables)
   {
     mInitTimetables = timetables;
   }
diff --git a/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java b/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java
new file mode 100644
index 0000000000..1fa12e4210
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java
@@ -0,0 +1,8 @@
+package com.mapswithme.maps.editor;
+
+import android.support.annotation.Nullable;
+
+interface TimetableChangedListener
+{
+  void onTimetableChanged(@Nullable String timetable);
+}
diff --git a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java
index 0878255f6e..545ffe00b0 100644
--- a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java
+++ b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.editor;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -11,13 +12,16 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragment;
 import com.mapswithme.maps.base.OnBackPressListener;
+import com.mapswithme.util.UiUtils;
 
-public class TimetableContainerFragment extends BaseMwmFragment implements OnBackPressListener
+public class TimetableContainerFragment extends BaseMwmFragment implements OnBackPressListener,
+                                                                           TimetableChangedListener
 {
   public static final String EXTRA_TIME = "Time";
 
@@ -36,12 +40,27 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
       String getFragmentClassname() { return AdvancedTimetableFragment.class.getName(); }
       @StringRes
       int getSwitchButtonLabel() { return R.string.editor_time_simple; }
+
+      void setTimetableChangedListener(@NonNull Fragment fragment,
+                                       @NonNull TimetableChangedListener listener)
+      {
+        ((AdvancedTimetableFragment) fragment).setTimetableChangedListener(listener);
+      }
     };
 
     @NonNull
     abstract String getFragmentClassname();
     @StringRes
     abstract int getSwitchButtonLabel();
+    void setTimetableChangedListener(@NonNull Fragment fragment,
+                                     @NonNull TimetableChangedListener listener)
+    {
+    }
+    @NonNull
+    static TimetableProvider getTimetableProvider(@NonNull Fragment fragment)
+    {
+      return (TimetableProvider) fragment;
+    }
   }
 
   @NonNull
@@ -67,13 +86,22 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
   {
     super.onViewCreated(view, savedInstanceState);
 
+    Activity activity = getActivity();
+    if (activity != null)
+      activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+
     initViews(view);
-    mMode = Mode.ADVANCED;
-    switchMode();
 
     final Bundle args = getArguments();
-    if (args != null && mTimetableProvider != null && !TextUtils.isEmpty(args.getString(EXTRA_TIME)))
-      mTimetableProvider.setTimetables(args.getString(EXTRA_TIME));
+    String time = null;
+    if (args != null)
+      time = args.getString(EXTRA_TIME);
+
+    // Show Simple fragment when opening hours can be represented by UI.
+    if (TextUtils.isEmpty(time) || OpeningHours.nativeTimetablesFromString(time) != null)
+      setMode(Mode.SIMPLE, time);
+    else
+      setMode(Mode.ADVANCED, time);
   }
 
   @Nullable
@@ -85,10 +113,12 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
     return mTimetableProvider.getTimetables();
   }
 
-  private void initViews(View root)
+  @Override
+  public void onTimetableChanged(@Nullable String timetable)
   {
-    mSwitchMode = root.findViewById(R.id.tv__mode_switch);
-    mSwitchMode.setOnClickListener(v -> switchMode());
+    UiUtils.showIf(TextUtils.isEmpty(timetable)
+                           || OpeningHours.nativeTimetablesFromString(timetable) != null,
+                   mSwitchMode);
   }
 
   @Override
@@ -97,24 +127,18 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
     return false;
   }
 
-  private void switchMode()
+  private void initViews(@NonNull View root)
   {
-    switch (mMode)
-    {
-      case SIMPLE:
-        setMode(Mode.ADVANCED);
-        break;
-      case ADVANCED:
-        setMode(Mode.SIMPLE);
-        break;
-    }
+    mSwitchMode = root.findViewById(R.id.tv__mode_switch);
+    mSwitchMode.setOnClickListener(v -> switchMode());
   }
 
-  private void setMode(Mode mode)
+  private void switchMode()
   {
     final String filledTimetables = mTimetableProvider != null ? mTimetableProvider.getTimetables()
-                                                               : OpeningHours.nativeTimetablesToString(OpeningHours.nativeGetDefaultTimetables());
-    if (!OpeningHours.nativeIsTimetableStringValid(filledTimetables))
+                                                               : null;
+
+    if (filledTimetables != null && !OpeningHours.nativeIsTimetableStringValid(filledTimetables))
     {
       FragmentActivity activity = getActivity();
       if (activity == null)
@@ -127,6 +151,19 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
       return;
     }
 
+    switch (mMode)
+    {
+      case SIMPLE:
+        setMode(Mode.ADVANCED, filledTimetables);
+        break;
+      case ADVANCED:
+        setMode(Mode.SIMPLE, filledTimetables);
+        break;
+    }
+  }
+
+  private void setMode(@NonNull Mode mode, @Nullable String timetables)
+  {
     mMode = mode;
     mSwitchMode.setText(mMode.getSwitchButtonLabel());
 
@@ -134,8 +171,8 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
       mFragments[mMode.ordinal()] = Fragment.instantiate(getActivity(), mMode.getFragmentClassname());
     Fragment fragment = mFragments[mMode.ordinal()];
     getChildFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commit();
-
-    mTimetableProvider = (TimetableProvider) fragment;
-    mTimetableProvider.setTimetables(filledTimetables);
+    mMode.setTimetableChangedListener(fragment, this);
+    mTimetableProvider = Mode.getTimetableProvider(fragment);
+    mTimetableProvider.setTimetables(timetables);
   }
 }