diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 3aeea4d36c..e5d0a0a7ff 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -150,7 +150,7 @@ void DIALOG_EDIT_ONE_FIELD::init()
 void DIALOG_EDIT_ONE_FIELD::OnTextValueSelectButtonClick( wxCommandEvent& aEvent )
 {
     // pick a footprint using the footprint picker.
-    wxString fpid;
+    wxString fpid = m_TextValue->GetValue();
 
     KIWAY_PLAYER* frame = Kiway().Player( FRAME_PCB_MODULE_VIEWER_MODAL, true );
 
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index a92e26ad35..90a7fe07ff 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -233,11 +233,10 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
     }
 
     drawPanel->DisplayBoard( m_Pcb );
-    updateView();
 
     m_auimgr.SetManagedWindow( this );
 
-    wxSize minsize(100,-1);     // Min size of list boxes
+    wxSize minsize( 100, -1 );     // Min size of list boxes
 
     // Main toolbar is initially docked at the top of the main window and dockable on any side.
     // The close button is disable because the footprint viewer has no main menu to re-enable it.
@@ -303,6 +302,7 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
 
     GetGalCanvas()->GetGAL()->SetAxesEnabled( true );
     UseGalCanvas( switchToGalCanvas );
+    updateView();
 
     if( !IsModal() )        // For modal mode, calling ShowModal() will show this frame
     {