diff --git a/src/wx/viewsupt.cpp b/src/wx/viewsupt.cpp
index 3df1c6d1..422f9b52 100644
--- a/src/wx/viewsupt.cpp
+++ b/src/wx/viewsupt.cpp
@@ -1174,7 +1174,7 @@ void GfxViewer::SaveBMP(wxCommandEvent& ev)
     if (ret != wxID_OK)
         return;
 
-    wxBitmap obmp = gv->bm->GetSubBitmap(wxRect(0, 0, gv->bmh, gv->bmh));
+    wxBitmap obmp = gv->bm->GetSubBitmap(wxRect(0, 0, gv->bmw, gv->bmh));
     wxString fn = dlg.GetPath();
     wxBitmapType fmt = dlg.GetFilterIndex() ? wxBITMAP_TYPE_BMP : wxBITMAP_TYPE_PNG;
 
@@ -1200,6 +1200,8 @@ BEGIN_EVENT_TABLE(GfxViewer, Viewer)
 EVT_CHECKBOX(XRCID("Stretch"), GfxViewer::StretchTog)
 EVT_BUTTON(XRCID("Refresh"), GfxViewer::RefreshEv)
 EVT_BUTTON(XRCID("Save"), GfxViewer::SaveBMP)
+EVT_BUTTON(XRCID("SaveGBOAM"), GfxViewer::SaveBMP)
+EVT_BUTTON(XRCID("SaveGBAOAM"), GfxViewer::SaveBMP)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(DispCheckBox, wxCheckBox)
diff --git a/src/wx/xrc/GBOAMViewer.xrc b/src/wx/xrc/GBOAMViewer.xrc
index 72337261..9212d9d3 100644
--- a/src/wx/xrc/GBOAMViewer.xrc
+++ b/src/wx/xrc/GBOAMViewer.xrc
@@ -145,7 +145,7 @@
             <border>5</border>
           </object>
           <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
+            <object class="wxButton" name="SaveGBOAM">
               <label>_Save...</label>
             </object>
             <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
diff --git a/src/wx/xrc/OAMViewer.xrc b/src/wx/xrc/OAMViewer.xrc
index 915766bb..16ba6fae 100644
--- a/src/wx/xrc/OAMViewer.xrc
+++ b/src/wx/xrc/OAMViewer.xrc
@@ -158,7 +158,7 @@
             <border>5</border>
           </object>
           <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
+            <object class="wxButton" name="SaveGBAOAM">
               <label>_Save...</label>
             </object>
             <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>