diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp
index 62ec92413..3e53c9f45 100644
--- a/PowerEditor/src/NppNotification.cpp
+++ b/PowerEditor/src/NppNotification.cpp
@@ -179,7 +179,6 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 					if (pBuf != currentBufMain && pBuf != currentBufSub) // if hover on other tab
 					{
 						_documentPeeker.doDialog(p, pBuf, *(const_cast<ScintillaEditView*>(pTabDocView->getScintillaEditView())));
-						_pEditView->getFocus();
 					}
 					else  // if hover on current active tab
 					{
diff --git a/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.cpp b/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.cpp
index de2d0ce56..ffc093428 100644
--- a/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.cpp
+++ b/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.cpp
@@ -65,7 +65,7 @@ void DocumentPeeker::doDialog(POINT p, Buffer *pBuf, ScintillaEditView & scintSo
 
 void DocumentPeeker::goTo(POINT p)
 {
-	::SetWindowPos(_hSelf, HWND_TOP, p.x, p.y + 10, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW);
+	::SetWindowPos(_hSelf, HWND_TOP, p.x, p.y + 10, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW | SWP_NOACTIVATE);
 }
 
 
@@ -101,7 +101,6 @@ void DocumentPeeker::syncDisplay(Buffer *buf, ScintillaEditView & scintSource)
 		_pPeekerView->showMargin(3, false);
 
 		_pPeekerView->execute(SCI_SETCARETSTYLE, CARETSTYLE_INVISIBLE);
-		Window::display();
 	}
 }
 
diff --git a/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.rc b/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.rc
index 4ab73845e..c6052be9f 100644
--- a/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.rc
+++ b/PowerEditor/src/WinControls/DocumentMap/documentSnapshot.rc
@@ -31,7 +31,8 @@
 
 
 IDD_DOCUMENTSNAPSHOT DIALOGEX 26, 41, 140, 140
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU | WS_DISABLED
+EXSTYLE WS_EX_NOACTIVATE
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
 END