diff --git a/x64_dbg_gui/Project/Src/Gui/CPUDump.cpp b/x64_dbg_gui/Project/Src/Gui/CPUDump.cpp
index b32ded00..0f03e01e 100644
--- a/x64_dbg_gui/Project/Src/Gui/CPUDump.cpp
+++ b/x64_dbg_gui/Project/Src/Gui/CPUDump.cpp
@@ -1,5 +1,6 @@
 #include "CPUDump.h"
 #include "Configuration.h"
+#include "HexEditDialog.h"
 
 CPUDump::CPUDump(QWidget *parent) : HexDump(parent)
 {
@@ -78,6 +79,17 @@ CPUDump::CPUDump(QWidget *parent) : HexDump(parent)
 
 void CPUDump::setupContextMenu()
 {
+    //Binary menu
+    mBinaryMenu = new QMenu("B&inary", this);
+
+    //Binary->Edit
+    mBinaryEditAction = new QAction("&Edit", this);
+    mBinaryEditAction->setShortcutContext(Qt::WidgetShortcut);
+    mBinaryEditAction->setShortcut(QKeySequence("ctrl+e"));
+    this->addAction(mBinaryEditAction);
+    connect(mBinaryEditAction, SIGNAL(triggered()), this, SLOT(binaryEditSlot()));
+    mBinaryMenu->addAction(mBinaryEditAction);
+
     //Label
     mSetLabelAction = new QAction("Set Label", this);
     mSetLabelAction->setShortcutContext(Qt::WidgetShortcut);
@@ -327,6 +339,7 @@ void CPUDump::contextMenuEvent(QContextMenuEvent* event)
     if(!DbgIsDebugging())
         return;
     QMenu* wMenu = new QMenu(this); //create context menu
+    wMenu->addMenu(mBinaryMenu);
     wMenu->addAction(mSetLabelAction);
     wMenu->addMenu(mBreakpointMenu);
     wMenu->addMenu(mGotoMenu);
@@ -958,3 +971,23 @@ void CPUDump::hardwareRemoveSlot()
     QString addr_text=QString("%1").arg(rvaToVa(getInitialSelection()), sizeof(int_t) * 2, 16, QChar('0')).toUpper();
     DbgCmdExec(QString("bphwc "+addr_text).toUtf8().constData());
 }
+
+void CPUDump::binaryEditSlot()
+{
+    HexEditDialog hexEdit(this);
+    int_t selStart = getSelectionStart();
+    int_t selSize = getSelectionEnd() - selStart + 1;
+    byte_t* data = new byte_t[selSize];
+    mMemPage->read(data, selStart, selSize);
+    hexEdit.mHexEdit->setData(QByteArray((const char*)data, selSize));
+    delete [] data;
+    hexEdit.setWindowTitle("Edit data at " + QString("%1").arg(rvaToVa(selStart), sizeof(int_t) * 2, 16, QChar('0')).toUpper());
+    if(hexEdit.exec() != QDialog::Accepted)
+        return;
+    int_t dataSize = hexEdit.mHexEdit->data().size();
+    int_t newSize = selSize > dataSize ? selSize : dataSize;
+    data = new byte_t[newSize];
+    mMemPage->read(data, selStart, newSize);
+    QByteArray patched = hexEdit.mHexEdit->applyMaskedData(QByteArray((const char*)data, newSize));
+    mMemPage->write(patched.constData(), selStart, patched.size());
+}
diff --git a/x64_dbg_gui/Project/Src/Gui/CPUDump.h b/x64_dbg_gui/Project/Src/Gui/CPUDump.h
index 22dbee8c..c4ca92f9 100644
--- a/x64_dbg_gui/Project/Src/Gui/CPUDump.h
+++ b/x64_dbg_gui/Project/Src/Gui/CPUDump.h
@@ -69,6 +69,8 @@ public slots:
     void selectionGet(SELECTIONDATA* selection);
     void selectionSet(const SELECTIONDATA* selection);
 
+    void binaryEditSlot();
+
 private:
     QMenu* mBreakpointMenu;
 
@@ -137,6 +139,9 @@ private:
 
     QAction* mSetLabelAction;
 
+    QMenu* mBinaryMenu;
+    QAction* mBinaryEditAction;
+
     QMenu* mSpecialMenu;
     QMenu* mCustomMenu;
 
diff --git a/x64_dbg_gui/Project/Src/Memory/MemoryPage.cpp b/x64_dbg_gui/Project/Src/Memory/MemoryPage.cpp
index a8454b5d..37aca111 100644
--- a/x64_dbg_gui/Project/Src/Memory/MemoryPage.cpp
+++ b/x64_dbg_gui/Project/Src/Memory/MemoryPage.cpp
@@ -8,12 +8,25 @@ MemoryPage::MemoryPage(uint_t parBase, uint_t parSize, QObject *parent) : QObjec
     mSize = 0;
 }
 
+bool MemoryPage::read(void* parDest, uint_t parRVA, uint_t parSize)
+{
+    return DbgMemRead(mBase + parRVA, (unsigned char*)parDest, parSize);
+}
 
 bool MemoryPage::read(byte_t* parDest, uint_t parRVA, uint_t parSize)
 {
-    return DbgMemRead(mBase + parRVA, parDest, parSize);
+    return read((void*)parDest, parRVA, parSize);
 }
 
+bool MemoryPage::write(const void* parDest, uint_t parRVA, uint_t parSize)
+{
+    return DbgMemWrite(mBase + parRVA, (unsigned char*)parDest, parSize);
+}
+
+bool MemoryPage::write(const byte_t* parDest, uint_t parRVA, uint_t parSize)
+{
+    return write((const void*)parDest, parRVA, parSize);
+}
 
 uint_t MemoryPage::getSize()
 {
diff --git a/x64_dbg_gui/Project/Src/Memory/MemoryPage.h b/x64_dbg_gui/Project/Src/Memory/MemoryPage.h
index 5eb6baa3..ac41a176 100644
--- a/x64_dbg_gui/Project/Src/Memory/MemoryPage.h
+++ b/x64_dbg_gui/Project/Src/Memory/MemoryPage.h
@@ -15,7 +15,10 @@ class MemoryPage : public QObject
 public:
     explicit MemoryPage(uint_t parBase, uint_t parSize, QObject *parent = 0);
 
+    bool read(void* parDest, uint_t parRVA, uint_t parSize);
     bool read(byte_t* parDest, uint_t parRVA, uint_t parSize);
+    bool write(const void* parDest, uint_t parRVA, uint_t parSize);
+    bool write(const byte_t* parDest, uint_t parRVA, uint_t parSize);
     uint_t getSize();
     uint_t getBase();
     uint_t va(int_t rva);