diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index 5c8298d2..d7c2b22e 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -1342,7 +1342,7 @@ static INT_PTR CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 
     hTreeItems=(HTREEITEM*)GlobalAlloc(GPTR,sizeof(HTREEITEM)*num_sections);
 
-    hBMcheck1=LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); // LR_CREATEDIBSECTION required to load TopDown bitmaps
+    hBMcheck1=LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); // LR_CREATEDIBSECTION required to load TopDown bitmaps but that breaks modern.bmp
 
     last_selected_tree_item=-1;
     oldTreeWndProc=(WNDPROC)SetWindowLongPtr(hwndTree1,GWLP_WNDPROC,(LONG_PTR)newTreeWndProc);
diff --git a/Source/util.cpp b/Source/util.cpp
index 59524ca6..ba194c1c 100644
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -146,7 +146,7 @@ int update_bitmap(CResourceEditor* re, WORD id, const TCHAR* filename, int width
   signed char hdr[14+124], retval = -2;
   size_t size = fread(hdr, 1, sizeof(hdr), f);
   GENERICIMAGEINFO info;
-  if (IsBMPFile(hdr, size, &info) && 0 == fseek(f, 0, SEEK_SET))
+  if (IsBMPFile(hdr, size, &info) && 0 == fseek(f, 0, SEEK_SET) && info.Height == info.RawHeight)
   {
     if ((width && width != (int) info.Width) || (height && height != (int) info.Height))
       retval = -3;