diff --git a/Scylla/DisassemblerGui.cpp b/Scylla/DisassemblerGui.cpp
index 77a7d22..cd0927a 100644
--- a/Scylla/DisassemblerGui.cpp
+++ b/Scylla/DisassemblerGui.cpp
@@ -1,138 +1,145 @@
 #include "DisassemblerGui.h"
 
 #include "ProcessAccessHelp.h"
 
 DisassemblerGui::DisassemblerGui(DWORD_PTR startAddress) : startAddress(startAddress)
 {
 	hMenuDisassembler.LoadMenu(IDR_MENU_DISASSEMBLER);
 }
 
 BOOL DisassemblerGui::OnInitDialog(CWindow wndFocus, LPARAM lInitParam)
 {
 	ListDisassembler.Attach(GetDlgItem(IDC_LIST_DISASSEMBLER));
 
 	addColumnsToDisassembler(ListDisassembler);
 	displayDisassembly(ListDisassembler);
 
 	CenterWindow();
 
 	return TRUE;
 }
 
 void DisassemblerGui::OnContextMenu(CWindow wnd, CPoint point)
 {
 	if (wnd.GetDlgCtrlID() == IDC_LIST_DISASSEMBLER)
 	{
+		int selection = ListDisassembler.GetSelectionMark();
+		if(selection == -1) // no item selected
+			return;
+
 		if(hMenuDisassembler)
 		{
+			if(point.x == -1 && point.y == -1) // invoked by keyboard
+			{
+				ListDisassembler.EnsureVisible(selection, TRUE);
+				ListDisassembler.GetItemPosition(selection, &point);
+				ListDisassembler.ClientToScreen(&point);
+			}
+
 			CMenuHandle hSub = hMenuDisassembler.GetSubMenu(0);
 
 			BOOL menuItem = hSub.TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y, wnd);
 			if (menuItem)
 			{
-				int selection = ListDisassembler.GetSelectionMark();
-				if (selection != -1) //valid selection?
+				int column = -1;
+				switch (menuItem)
+				{
+				case ID__DIS_ADDRESS:
+					column = COL_ADDRESS;
+					break;
+				case ID__DIS_SIZE:
+					column = COL_INSTRUCTION_SIZE;
+					break;
+				case ID__DIS_OPCODES:
+					column = COL_OPCODES;
+					break;
+				case ID__DIS_INSTRUCTIONS:
+					column = COL_INSTRUCTION;
+					break;
+				}
+				if(column != -1)
 				{
-					int column = -1;
-					switch (menuItem)
-					{
-					case ID__DIS_ADDRESS:
-						column = COL_ADDRESS;
-						break;
-					case ID__DIS_SIZE:
-						column = COL_INSTRUCTION_SIZE;
-						break;
-					case ID__DIS_OPCODES:
-						column = COL_OPCODES;
-						break;
-					case ID__DIS_INSTRUCTIONS:
-						column = COL_INSTRUCTION;
-						break;
-					}
-					if(column != -1)
-					{
-						tempBuffer[0] = '\0';
-						ListDisassembler.GetItemText(selection, column, tempBuffer, _countof(tempBuffer));
-						copyToClipboard(tempBuffer);
-					}
+					tempBuffer[0] = '\0';
+					ListDisassembler.GetItemText(selection, column, tempBuffer, _countof(tempBuffer));
+					copyToClipboard(tempBuffer);
 				}
 			}
 		}
 	}
 }
 
-void DisassemblerGui::OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl)
+void DisassemblerGui::OnExit(UINT uNotifyCode, int nID, CWindow wndCtl)
 {
 	EndDialog(0);
 }
 
 void DisassemblerGui::addColumnsToDisassembler(CListViewCtrl& list)
 {
 	list.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
 
 	list.InsertColumn(COL_ADDRESS, L"Address", LVCFMT_LEFT);
 	list.InsertColumn(COL_INSTRUCTION_SIZE, L"Size", LVCFMT_CENTER);
 	list.InsertColumn(COL_OPCODES, L"Opcodes", LVCFMT_LEFT);
 	list.InsertColumn(COL_INSTRUCTION, L"Instructions", LVCFMT_LEFT);
 }
 
 void DisassemblerGui::displayDisassembly(CListViewCtrl& list)
 {
 	BYTE data[DISASSEMBLER_GUI_MEMORY_SIZE];
 
 	list.DeleteAllItems();
 
 	if(!ProcessAccessHelp::readMemoryFromProcess(startAddress, sizeof(data), data))
 		return;
 
 	ProcessAccessHelp::disassembleMemory(data, sizeof(data), startAddress);
 
 	for (unsigned int i = 0; i < ProcessAccessHelp::decodedInstructionsCount; i++)
 	{
 
 #ifdef _WIN64
 		swprintf_s(tempBuffer, _countof(tempBuffer),L"%016I64X",ProcessAccessHelp::decodedInstructions[i].offset);
 #else
 		swprintf_s(tempBuffer, _countof(tempBuffer),L"%08X",ProcessAccessHelp::decodedInstructions[i].offset);
 #endif
 
 		list.InsertItem(i, tempBuffer);
 
 		swprintf_s(tempBuffer, _countof(tempBuffer),L"%02d",ProcessAccessHelp::decodedInstructions[i].size);
 
 		list.SetItemText(i, COL_INSTRUCTION_SIZE, tempBuffer);
 
 		swprintf_s(tempBuffer, _countof(tempBuffer),L"%S",(char *)ProcessAccessHelp::decodedInstructions[i].instructionHex.p);
 
 		list.SetItemText(i, COL_OPCODES, tempBuffer);
 
 		swprintf_s(tempBuffer, _countof(tempBuffer),L"%S%S%S",(char*)ProcessAccessHelp::decodedInstructions[i].mnemonic.p, ProcessAccessHelp::decodedInstructions[i].operands.length != 0 ? " " : "", (char*)ProcessAccessHelp::decodedInstructions[i].operands.p);
 
 		list.SetItemText(i, COL_INSTRUCTION, tempBuffer);
 	}
 
 	list.SetColumnWidth(COL_ADDRESS, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_INSTRUCTION_SIZE, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_OPCODES, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_INSTRUCTION, LVSCW_AUTOSIZE_USEHEADER);
 }
 
 void DisassemblerGui::copyToClipboard(const WCHAR * text)
 {
 	if(OpenClipboard())
 	{
 		EmptyClipboard();
 		size_t len = wcslen(text);
 		HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, (len+1)*sizeof(WCHAR));
 		if(hMem)
 		{
 			wcscpy_s((WCHAR *)GlobalLock(hMem), len+1, text);
 			GlobalUnlock(hMem);
 			if(!SetClipboardData(CF_UNICODETEXT, hMem))
 			{
 				GlobalFree(hMem);
 			}
 		}
 		CloseClipboard();
 	}
 }
diff --git a/Scylla/DisassemblerGui.h b/Scylla/DisassemblerGui.h
index f52de80..8605352 100644
--- a/Scylla/DisassemblerGui.h
+++ b/Scylla/DisassemblerGui.h
@@ -1,68 +1,69 @@
 #pragma once
 
 #include <windows.h>
 #include "resource.h"
 
 // WTL
 #include <atlbase.h>       // base ATL classes
 #include <atlapp.h>        // base WTL classes
 #include <atlwin.h>        // ATL GUI classes
 #include <atlmisc.h>       // WTL utility classes like CString
 #include <atlcrack.h>      // WTL enhanced msg map macros
 #include <atlctrls.h>      // WTL controls
 
 class DisassemblerGui : public CDialogImpl<DisassemblerGui>
 {
 public:
 	enum { IDD = IDD_DLG_DISASSEMBLER };
 
 	BEGIN_MSG_MAP(DisassemblerGui)
 		MSG_WM_INITDIALOG(OnInitDialog)
 		MSG_WM_CONTEXTMENU(OnContextMenu)
 
-		COMMAND_ID_HANDLER_EX(IDCANCEL, OnCancel)
+		COMMAND_ID_HANDLER_EX(IDCANCEL, OnExit)
+		COMMAND_ID_HANDLER_EX(IDOK, OnExit)
 	END_MSG_MAP()
 
 	DisassemblerGui(DWORD_PTR startAddress);
 
 protected:
 
 	// Variables
 
 	static const size_t DISASSEMBLER_GUI_MEMORY_SIZE = 0x100;
 
 	WCHAR tempBuffer[100];
 	DWORD_PTR startAddress;
 
 	// Controls
 
 	CListViewCtrl ListDisassembler;
 
 	enum DisassemblerColumns {
 		COL_ADDRESS = 0,
 		COL_INSTRUCTION_SIZE,
 		COL_OPCODES,
 		COL_INSTRUCTION
 	};
 
 	// Handles
 
 	CMenu hMenuDisassembler;
 
 protected:
 
 	// Message handlers
 
 	BOOL OnInitDialog(CWindow wndFocus, LPARAM lInitParam);
 	void OnContextMenu(CWindow wnd, CPoint point);
-	void OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl);
+	void OnExit(UINT uNotifyCode, int nID, CWindow wndCtl);
 
 	// GUI functions
 
 	void addColumnsToDisassembler(CListViewCtrl& list);
 	void displayDisassembly(CListViewCtrl& list);
 
 	// Misc
 
 	void copyToClipboard(const WCHAR * text);
 };