diff --git a/src/drivers/Qt/TasEditor/bookmarks.cpp b/src/drivers/Qt/TasEditor/bookmarks.cpp
index cfe240d4..79eb49f3 100644
--- a/src/drivers/Qt/TasEditor/bookmarks.cpp
+++ b/src/drivers/Qt/TasEditor/bookmarks.cpp
@@ -28,28 +28,9 @@ Bookmarks/Branches - Manager of Bookmarks
 #include "Qt/TasEditor/TasEditorWindow.h"
 #include "Qt/TasEditor/TasColors.h"
 
-//#pragma comment(lib, "msimg32.lib")
-
-//LRESULT APIENTRY BookmarksListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-//WNDPROC hwndBookmarksList_oldWndProc;
-
-//extern TASEDITOR_CONFIG taseditorConfig;
-//extern TASEDITOR_WINDOW taseditorWindow;
-//extern POPUP_DISPLAY popupDisplay;
-//extern PLAYBACK playback;
-//extern RECORDER recorder;
-//extern SELECTION selection;
-//extern GREENZONE greenzone;
-//extern TASEDITOR_PROJECT project;
-//extern HISTORY history;
-//extern PIANO_ROLL pianoRoll;
-//extern MARKERS_MANAGER markersManager;
-//extern BRANCHES branches;
-
 // resources
 static char bookmarks_save_id[BOOKMARKS_ID_LEN] = "BOOKMARKS";
 static char bookmarks_skipsave_id[BOOKMARKS_ID_LEN] = "BOOKMARKX";
-//char bookmarksCaption[3][23] = { " Bookmarks ", " Bookmarks / Branches ", " Branches " };
 // color tables for flashing when saving/loading bookmarks
 //COLORREF bookmark_flash_colors[TOTAL_BOOKMARK_COMMANDS][FLASH_PHASE_MAX+1] = {
 //	// set
@@ -144,6 +125,7 @@ void BOOKMARKS::setFont( QFont &newFont )
 
 void BOOKMARKS::calcFontData(void)
 {
+	int w,h;
 	QWidget::setFont(font);
 	QFontMetrics metrics(font);
 #if QT_VERSION > QT_VERSION_CHECK(5, 11, 0)
@@ -171,11 +153,12 @@ void BOOKMARKS::calcFontData(void)
 	pxStartCol2 =  pxWidthCol1;
 	pxStartCol3 =  pxWidthCol1 + pxWidthFrameCol;
 
-	viewWidth  = pxLineWidth;
-	viewHeight = pxLineSpacing * TOTAL_BOOKMARKS;
+	w = pxLineWidth;
+	h = pxLineSpacing * TOTAL_BOOKMARKS;
 
-	setMinimumWidth( viewWidth );
-	setMinimumHeight( viewHeight );
+	setMinimumWidth( w );
+	setMinimumHeight( h );
+	resize(w,h);
 }
 
 void BOOKMARKS::update()
@@ -799,6 +782,7 @@ void BOOKMARKS::mouseReleaseEvent(QMouseEvent * event)
 
 void BOOKMARKS::showImage(void)
 {
+	fceuCriticalSection emuLock;
 	static_cast<bookmarkPreviewPopup*>(fceuCustomToolTipShow( imagePos, new bookmarkPreviewPopup(imageItem, this) ));
 }
 
diff --git a/src/drivers/Qt/TasEditor/branches.cpp b/src/drivers/Qt/TasEditor/branches.cpp
index 4df822e3..082623f2 100644
--- a/src/drivers/Qt/TasEditor/branches.cpp
+++ b/src/drivers/Qt/TasEditor/branches.cpp
@@ -32,20 +32,6 @@ Branches - Manager of Branches
 #include "Qt/TasEditor/TasEditorWindow.h"
 
 
-//LRESULT APIENTRY BranchesBitmapWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-//WNDPROC hwndBranchesBitmap_oldWndProc;
-
-//extern TASEDITOR_CONFIG taseditorConfig;
-//extern TASEDITOR_WINDOW taseditorWindow;
-//extern POPUP_DISPLAY popupDisplay;
-//extern PLAYBACK playback;
-//extern SELECTION selection;
-//extern GREENZONE greenzone;
-//extern TASEDITOR_PROJECT project;
-//extern HISTORY history;
-//extern PIANO_ROLL pianoRoll;
-//extern BOOKMARKS bookmarks;
-
 //extern COLORREF bookmark_flash_colors[TOTAL_BOOKMARK_COMMANDS][FLASH_PHASE_MAX+1];
 
 // resources
@@ -69,6 +55,9 @@ BRANCHES::BRANCHES(QWidget *parent)
 	this->setMinimumWidth(BRANCHES_BITMAP_WIDTH);
 	this->setMinimumHeight(BRANCHES_BITMAP_HEIGHT);
 
+	viewWidth  = BRANCHES_BITMAP_WIDTH;
+	viewHeight = BRANCHES_BITMAP_HEIGHT;
+
 	g_config->getOption("SDL.TasBranchesFont", &fontString);
 
 	if ( fontString.size() > 0 )
@@ -567,6 +556,7 @@ void BRANCHES::mouseReleaseEvent(QMouseEvent * event)
 
 void BRANCHES::showImage(void)
 {
+	fceuCriticalSection emuLock;
 	static_cast<bookmarkPreviewPopup*>(fceuCustomToolTipShow( imagePos, new bookmarkPreviewPopup(imageItem, this) ));
 }
 
@@ -648,8 +638,8 @@ void BRANCHES::paintEvent(QPaintEvent *event)
 
 	QPainter painter(this);
 
-	viewWidth  = event->rect().width();
-	viewHeight = event->rect().height();
+	//viewWidth  = event->rect().width();
+	//viewHeight = event->rect().height();
 
 //	// draw background
 	QLinearGradient linearGrad(QPointF(0, 0), QPointF(viewWidth, viewHeight));