diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index 3a93d2e72f..a5ad9fe60e 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -493,6 +493,10 @@ void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event )
     wxGetApp().GetLibraryPathList().Insert( newFileName.GetPath(), 0 );
     m_NetlistFileName = newFileName;
     ReadNetListAndLinkFiles();
+
+    // OSX need it since some objects are "rebuild" just make aware AUI
+    // Fixes #1258081
+    m_auimgr.Update();
 }
 
 
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 7b3ddc2846..ea1c320956 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -1074,7 +1074,13 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_POPUP_PCB_EDIT_DRAWING:
+#ifndef USE_WX_OVERLAY
         InstallGraphicItemPropertiesDialog( (DRAWSEGMENT*) GetCurItem(), &dc );
+#else
+        // #1267772 - Draw into dialog converted in refresh request
+        InstallGraphicItemPropertiesDialog( (DRAWSEGMENT*) GetCurItem(), NULL );
+        m_canvas->Refresh();
+#endif
         m_canvas->MoveCursorToCrossHair();
         break;