diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index a73a38142..57a18d233 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -829,7 +829,7 @@ void WrapWidget::showAnimatedHook(
 }
 
 void WrapWidget::doSetInnerFocus() {
-	if (_topBar && !_topBar->focusSearchField()) {
+	if (!_topBar || !_topBar->focusSearchField()) {
 		_content->setInnerFocus();
 	}
 }
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
index e20f0571d..019ed3e37 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
@@ -125,6 +125,9 @@ rpl::producer<std::vector<Type>> Manage::removeTypes() {
 }
 
 void Manage::setupContent() {
+	setFocusPolicy(Qt::StrongFocus);
+	setFocus();
+
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	auto currentStepData = stepData();
 	_currentPassword = base::take(currentStepData.currentPassword);