diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 106c4767..bdce09ad 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -1103,9 +1103,9 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
 			var issel = (d_selectable_mode == GitgExt.SelectionMode.SELECTION);
 			var searchable = current_activity as GitgExt.Searchable;
 
-			d_header_bar.show_close_button = !issel;
+			d_header_bar.show_close_button = !Gitg.PlatformSupport.use_native_window_controls() && !issel;
 			d_search_button.visible = !issel && searchable != null;
-			d_gear_menu.visible = !issel;
+			d_gear_menu.visible = !issel && d_repository != null;
 			d_select_button.visible = !issel;
 			d_dash_button.visible = !issel && d_repository != null;
 			d_activities_switcher.visible = !issel && d_repository != null;