diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 502f5af5de..59c8af1329 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -467,6 +467,7 @@ void FOOTPRINT_EDIT_FRAME::AddFootprintToBoard( FOOTPRINT* aFootprint )
                     aFootprint->GetReference() );
 
         GetInfoBar()->RemoveAllButtons();
+        GetInfoBar()->AddCloseButton();
         GetInfoBar()->ShowMessage( msg, wxICON_INFORMATION );
     }
 
diff --git a/pcbnew/tools/footprint_editor_control.cpp b/pcbnew/tools/footprint_editor_control.cpp
index 18daf73ad7..ebcd4f63f4 100644
--- a/pcbnew/tools/footprint_editor_control.cpp
+++ b/pcbnew/tools/footprint_editor_control.cpp
@@ -31,6 +31,7 @@
 #include <footprint_edit_frame.h>
 #include <pcbnew_id.h>
 #include <confirm.h>
+#include <widgets/infobar.h>
 #include <bitmaps.h>
 #include <footprint.h>
 #include <project.h>
@@ -283,6 +284,12 @@ int FOOTPRINT_EDITOR_CONTROL::SaveAs( const TOOL_EVENT& aEvent )
             view()->Update( footprint() );
             m_frame->ClearModify();
 
+            // Get rid of the save-will-update-board-only (or any other dismissable warning)
+            WX_INFOBAR* infobar = m_frame->GetInfoBar();
+
+            if( infobar->IsShown() && infobar->HasCloseButton() )
+                infobar->Dismiss();
+
             canvas()->ForceRefresh();
             m_frame->SyncLibraryTree( true );
         }