diff --git a/map/active_maps_layout.cpp b/map/active_maps_layout.cpp
index e4186a140e..fb935f5a70 100644
--- a/map/active_maps_layout.cpp
+++ b/map/active_maps_layout.cpp
@@ -383,7 +383,7 @@ void ActiveMapsLayout::StatusChangedCallback(TIndex const & index)
 
   TGroup group = TGroup::ENewMap;
   int position = 0;
-  VERIFY(GetGroupAndPositionByIndex(index, group, position), ());
+  VERIFY(GetGroupAndPositionByIndex(index, group, position), (index));
   Item & item = GetItemInGroup(group, position);
 
   TStatus oldStatus = item.m_status;
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 3843d46657..a8f5ea6e20 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -2,6 +2,7 @@
 #include "slider_ctrl.hpp"
 
 #include "../map/render_policy.hpp"
+#include "../map/country_status_display.hpp"
 
 #include "../search/result.hpp"
 
@@ -86,6 +87,15 @@ namespace qt
     PinClickManager & manager = GetBalloonManager();
     manager.ConnectUserMarkListener(bind(&DrawWidget::OnActivateMark, this, _1));
     manager.ConnectDismissListener(&DummyDismiss);
+
+    m_framework->GetCountryStatusDisplay()->SetDownloadCountryListener([this] (storage::TIndex const & idx, int opt)
+    {
+      storage::ActiveMapsLayout & layout = m_framework->GetCountryTree().GetActiveMapLayout();
+      if (opt == -1)
+        layout.RetryDownloading(idx);
+      else
+        layout.DownloadMap(idx, static_cast<storage::TMapOptions>(opt));
+     });
   }
 
   DrawWidget::~DrawWidget()