diff --git a/Scylla/PickDllGui.cpp b/Scylla/PickDllGui.cpp
index 7bc746d..2262b95 100644
--- a/Scylla/PickDllGui.cpp
+++ b/Scylla/PickDllGui.cpp
@@ -1,120 +1,176 @@
 #include "PickDllGui.h"
 
 #include "WindowDeferrer.h"
 
 PickDllGui::PickDllGui(std::vector<ModuleInfo> &moduleList) : moduleList(moduleList)
 {
+	prevColumn = -1;
+	ascending = true;
+
 	selectedModule = 0;
 	hIcon.LoadIcon(IDI_ICON_SCYLLA);
 }
 
 BOOL PickDllGui::OnInitDialog(CWindow wndFocus, LPARAM lInitParam)
 {
 	ListDLLSelect.Attach(GetDlgItem(IDC_LIST_DLLSELECT));
 
 	addColumnsToModuleList(ListDLLSelect);
 	displayModuleList(ListDLLSelect);
 
 	CenterWindow();
 
 	SetIcon(hIcon, TRUE);
 	SetIcon(hIcon, FALSE);
 
 	GetWindowRect(&minDlgSize);
 
 	return TRUE;
 }
 
 void PickDllGui::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
 {
 	lpMMI->ptMinTrackSize.x = minDlgSize.Width();
 	lpMMI->ptMinTrackSize.y = minDlgSize.Height();
 }
 
 void PickDllGui::OnSizing(UINT fwSide, RECT* pRect)
 {
 	// Get size difference
 	CRect rectOld;
 	GetWindowRect(&rectOld);
 	CRect rectNew = *pRect;
 
 	int deltaX = rectNew.Width() - rectOld.Width();
 	int deltaY = rectNew.Height() - rectOld.Height();
 
 	CSize delta(deltaX, deltaY);
 	sizeOffset = delta;
 }
 
 void PickDllGui::OnSize(UINT nType, CSize size)
 {
 	const WindowDeferrer::Deferrable controls[] =
 	{
 		{IDC_LIST_DLLSELECT, false, false, true, true},
 		{IDC_BTN_PICKDLL_OK, true, true, false, false},
 		{IDC_BTN_PICKDLL_CANCEL, true, true, false, false},
 	};
 
 	if(nType == SIZE_RESTORED)
 	{
 		WindowDeferrer deferrer(m_hWnd, controls, _countof(controls));
 		deferrer.defer(sizeOffset.cx, sizeOffset.cy);
 		sizeOffset.SetSize(0, 0);
 	}
 }
 
+LRESULT PickDllGui::OnListDllColumnClicked(NMHDR* pnmh)
+{
+	NMLISTVIEW* list = (NMLISTVIEW*)pnmh;
+	int column = list->iSubItem;
+
+    if(column == prevColumn)
+	{
+        ascending = !ascending;
+	}
+    else
+    {
+		prevColumn = column;
+        ascending = true;
+    }
+
+	// lo-byte: column, hi-byte: sort-order
+	ListDLLSelect.SortItems(&listviewCompareFunc, MAKEWORD(column, ascending));
+
+	return 0;
+}
+
 void PickDllGui::OnOK(UINT uNotifyCode, int nID, CWindow wndCtl)
 {
 	int index = ListDLLSelect.GetSelectionMark();
 	if (index != -1)
 	{
-		selectedModule = &moduleList[index];
+		selectedModule = (ModuleInfo *)ListDLLSelect.GetItemData(index);
 		EndDialog(1);
 	}
 }
 
 void PickDllGui::OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl)
 {
 	EndDialog(0);
 }
 
 void PickDllGui::addColumnsToModuleList(CListViewCtrl& list)
 {
 	list.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
 
 	list.InsertColumn(COL_NAME, L"Name", LVCFMT_LEFT);
 	list.InsertColumn(COL_IMAGEBASE, L"ImageBase", LVCFMT_CENTER);
 	list.InsertColumn(COL_IMAGESIZE, L"ImageSize", LVCFMT_CENTER);
 	list.InsertColumn(COL_PATH, L"Path", LVCFMT_LEFT);
 }
 
 void PickDllGui::displayModuleList(CListViewCtrl& list)
 {
 	WCHAR temp[20];
 
 	list.DeleteAllItems();
 
 	std::vector<ModuleInfo>::const_iterator iter;
 	int count = 0;
 
 	for( iter = moduleList.begin(); iter != moduleList.end(); iter++ , count++)
 	{
 		list.InsertItem(count, iter->getFilename());
 
 #ifdef _WIN64
 		swprintf_s(temp, _countof(temp), L"%016I64X", iter->modBaseAddr);
 #else
 		swprintf_s(temp, _countof(temp), L"%08X", iter->modBaseAddr);
 #endif
 		list.SetItemText(count, COL_IMAGEBASE, temp);
 
 		swprintf_s(temp, _countof(temp),L"%08X",iter->modBaseSize);
 		list.SetItemText(count, COL_IMAGESIZE, temp);
 
 		list.SetItemText(count, COL_PATH, iter->fullPath);
+
+		list.SetItemData(count, (DWORD_PTR)&(*iter));
 	}
 
 	list.SetColumnWidth(COL_NAME, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_IMAGEBASE, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_IMAGESIZE, LVSCW_AUTOSIZE_USEHEADER);
 	list.SetColumnWidth(COL_PATH, LVSCW_AUTOSIZE_USEHEADER);
 }
+
+// lParamSort - lo-byte: column, hi-byte: sort-order
+int PickDllGui::listviewCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+{
+	const ModuleInfo * module1 = (ModuleInfo *)lParam1;
+	const ModuleInfo * module2 = (ModuleInfo *)lParam2;
+
+	int column = LOBYTE(lParamSort);
+	bool ascending = HIBYTE(lParamSort) == true;
+
+	int diff = 0;
+
+	switch(column)
+	{
+	case COL_NAME:
+		diff = _wcsicmp(module1->getFilename(), module2->getFilename());
+		break;
+	case COL_IMAGEBASE:
+		diff = module1->modBaseAddr < module2->modBaseAddr ? -1 : 1;
+		break;
+	case COL_IMAGESIZE:
+		diff = module1->modBaseSize < module2->modBaseSize ? -1 : 1;
+		break;
+	case COL_PATH:
+		diff = _wcsicmp(module1->fullPath, module2->fullPath);
+		break;
+	}
+
+	return ascending ? diff : -diff;
+}
diff --git a/Scylla/PickDllGui.h b/Scylla/PickDllGui.h
index 24c4642..9197b4c 100644
--- a/Scylla/PickDllGui.h
+++ b/Scylla/PickDllGui.h
@@ -1,77 +1,85 @@
 #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
 
 #include <vector>
 #include "ProcessAccessHelp.h"
 
 class PickDllGui : public CDialogImpl<PickDllGui>
 {
 public:
 	enum { IDD = IDD_DLG_PICKDLL };
 
 	BEGIN_MSG_MAP(PickDllGui)
 		MSG_WM_INITDIALOG(OnInitDialog)
 		MSG_WM_GETMINMAXINFO(OnGetMinMaxInfo)
 		MSG_WM_SIZING(OnSizing)
 		MSG_WM_SIZE(OnSize)
 
+		NOTIFY_HANDLER_EX(IDC_LIST_DLLSELECT, LVN_COLUMNCLICK, OnListDllColumnClicked)
 		COMMAND_ID_HANDLER_EX(IDC_BTN_PICKDLL_OK, OnOK)
 		COMMAND_ID_HANDLER_EX(IDC_BTN_PICKDLL_CANCEL, OnCancel)
 		COMMAND_ID_HANDLER_EX(IDCANCEL, OnCancel)
 	END_MSG_MAP()
 
 	PickDllGui(std::vector<ModuleInfo> &moduleList);
 
 	ModuleInfo* getSelectedModule() const { return selectedModule; }
 
 protected:
 
 	// Variables
 
 	std::vector<ModuleInfo> &moduleList;
 	ModuleInfo* selectedModule;
 
 	// Controls
 
 	CListViewCtrl ListDLLSelect;
 
 	enum ListColumns {
 		COL_NAME = 0,
 		COL_IMAGEBASE,
 		COL_IMAGESIZE,
 		COL_PATH
 	};
 
+	int prevColumn;
+	bool ascending;
+
 	CRect minDlgSize;
 	CSize sizeOffset;
 
 	// Handles
 
 	CIcon hIcon;
 
 protected:
 
 	// Message handlers
 
 	BOOL OnInitDialog(CWindow wndFocus, LPARAM lInitParam);
 	void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
 	void OnSizing(UINT fwSide, RECT* pRect);
 	void OnSize(UINT nType, CSize size);
+
+	LRESULT OnListDllColumnClicked(NMHDR* pnmh);
 	void OnOK(UINT uNotifyCode, int nID, CWindow wndCtl);
 	void OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl);
 
 	// GUI functions
 
 	void addColumnsToModuleList(CListViewCtrl& list);
 	void displayModuleList(CListViewCtrl& list);
+
+	static int CALLBACK listviewCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
 };