diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp
index 3b35d662e..80bb3006a 100644
--- a/src/Screenshot.cpp
+++ b/src/Screenshot.cpp
@@ -268,11 +268,19 @@ std::unique_ptr<ScreenshotCommand> ScreenFrame::CreateCommand()
 ScreenFrame::ScreenFrame(wxWindow * parent, wxWindowID id)
 :  wxFrame(parent, id, _("Screen Capture Frame"),
            wxDefaultPosition, wxDefaultSize,
+
 #if !defined(__WXMSW__)
-           wxFRAME_TOOL_WINDOW|
+
+   #if !defined(__WXMAC__) // bug1358
+           wxFRAME_TOOL_WINDOW |
+   #endif
+
 #else
+
            wxSTAY_ON_TOP|
+
 #endif
+
            wxSYSTEM_MENU|wxCAPTION|wxCLOSE_BOX),
    mContext(&wxGetApp(), GetActiveProject())
 {
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 4eb34a35d..56b837e3b 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -90,7 +90,9 @@ class ToolFrame final : public wxFrame
               wxDefaultSize,
               wxNO_BORDER |
               wxFRAME_NO_TASKBAR |
+#if !defined(__WXMAC__) // bug1358
               wxFRAME_TOOL_WINDOW |
+#endif
               wxFRAME_FLOAT_ON_PARENT )
    {
       int width = bar->GetSize().x;