1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index ae51c99..71d25cb 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -448,9 +448,9 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
     window_->SetIntProperty(aura::client::kShowStateKey, state);
   }
   window_->Show();
-  if (can_activate_ && (state != ui::SHOW_STATE_INACTIVE ||
-                        !GetWidget()->SetInitialFocus())) {
+  if (can_activate_ && state != ui::SHOW_STATE_INACTIVE) {
     Activate();
+    GetWidget()->SetInitialFocus();
   }
 }