diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index 68bfedd4e4..c24110dc83 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -2,6 +2,7 @@
 
 #include "indexer/feature.hpp"
 #include "indexer/feature_visibility.hpp"
+#include "indexer/ftypes_matcher.hpp"
 #include "indexer/drawing_rules.hpp"
 #include "indexer/drules_include.hpp"
 #include "indexer/scales.hpp"
@@ -181,6 +182,13 @@ void CaptionDescription::Init(FeatureType const & f,
   m_houseNumber = f.GetHouseNumber();
   m_populationRank = CalcPopulationRank(f);
 
+  if (ftypes::IsBuildingChecker::Instance()(f))
+  {
+    // Mark houses without names/numbers so user can select them by single tap.
+    if (m_houseNumber.empty() && m_mainText.empty())
+      m_houseNumber = "·";
+  }
+
   SwapCaptions(zoomLevel);
   DiscardLongCaption(zoomLevel);
 }