diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 9a4938425..64a6c0d2e 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -691,16 +691,27 @@ public class PlacePageView extends Fragment
       mTvAddPlace.setOnClickListener(this);
       mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
       mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
-      final int editPlaceButtonColor =
+      final int editTextButtonColor =
           Editor.nativeShouldEnableEditPlace()
               ? ContextCompat.getColor(
                     getContext(),
                     UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
-      mTvEditPlace.setTextColor(editPlaceButtonColor);
-      mTvAddPlace.setTextColor(editPlaceButtonColor);
-      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor));
-      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor));
+      final ColorStateList editStrokeButtonColor = new ColorStateList(
+              new int[][]{
+                      new int[]{android.R.attr.state_enabled}, // enabled
+                      new int[]{-android.R.attr.state_enabled} // disabled
+      },
+              new int[]{
+                      ContextCompat.getColor(
+                              getContext(),
+                              UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)),
+                      ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled)
+              });
+      mTvEditPlace.setTextColor(editTextButtonColor);
+      mTvAddPlace.setTextColor(editTextButtonColor);
+      mTvEditPlace.setStrokeColor(editStrokeButtonColor);
+      mTvAddPlace.setStrokeColor(editStrokeButtonColor);
       UiUtils.showIf(
           UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
           mEditTopSpace);