diff --git a/src/dialogs/EditStringDialog.cpp b/src/dialogs/EditStringDialog.cpp
index 5f6f2e74..9f14d636 100644
--- a/src/dialogs/EditStringDialog.cpp
+++ b/src/dialogs/EditStringDialog.cpp
@@ -3,20 +3,17 @@
 
 EditStringDialog::EditStringDialog(QWidget *parent)
     :   QDialog(parent)
-    ,   ui(new Ui::EditStringDialog)
+    ,   ui(new Ui::EditStringDialog{})
 {
     ui->setupUi(this);
     ui->spinBox_size->setMinimum(0);
     ui->lineEdit_address->setMinimumWidth(150);
-    ui->pushButton_ok->setFocus();
+    ui->spinBox_size->setFocus();
     ui->comboBox_type->addItems({"Auto", "ASCII/Latin1", "UTF-8"});
     connect(ui->checkBox_autoSize, &QCheckBox::toggled, ui->spinBox_size, &QSpinBox::setDisabled);
 }
 
-EditStringDialog::~EditStringDialog()
-{
-    delete ui;
-}
+EditStringDialog::~EditStringDialog() { }
 
 void EditStringDialog::setStringStartAddress(uint64_t address)
 {
diff --git a/src/dialogs/EditStringDialog.h b/src/dialogs/EditStringDialog.h
index 78a48652..72fabd8d 100644
--- a/src/dialogs/EditStringDialog.h
+++ b/src/dialogs/EditStringDialog.h
@@ -1,6 +1,7 @@
 #ifndef EDITSTRINGDIALOG_H
 #define EDITSTRINGDIALOG_H
 
+#include <memory>
 #include <QDialog>
 
 namespace Ui {
@@ -52,7 +53,7 @@ public:
     StringType getStringType() const;
 
 private:
-    Ui::EditStringDialog *ui;
+    std::unique_ptr<Ui::EditStringDialog> ui;
 };
 
 #endif // EDITSTRINGDIALOG_H
diff --git a/src/dialogs/EditStringDialog.ui b/src/dialogs/EditStringDialog.ui
index c6fa8623..d265fb1d 100644
--- a/src/dialogs/EditStringDialog.ui
+++ b/src/dialogs/EditStringDialog.ui
@@ -23,17 +23,23 @@
    <string>Edit string</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="dialogButtonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="label_address">
-         <property name="text">
-          <string>Address:</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QLabel" name="label_size">
          <property name="minimumSize">
@@ -54,23 +60,23 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="label_address">
+         <property name="text">
+          <string>Address:</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLineEdit" name="lineEdit_address">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QSpinBox" name="spinBox_size">
          <property name="minimumSize">
           <size>
            <width>150</width>
-           <height>0</height>
+           <height>24</height>
           </size>
          </property>
         </widget>
@@ -78,9 +84,16 @@
        <item>
         <widget class="QComboBox" name="comboBox_type"/>
        </item>
+       <item>
+        <widget class="QLineEdit" name="lineEdit_address">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
-     <item>
+     <item alignment="Qt::AlignTop">
       <widget class="QCheckBox" name="checkBox_autoSize">
        <property name="text">
         <string>Auto</string>
@@ -89,29 +102,22 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QPushButton" name="pushButton_cancel">
-     <property name="text">
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="pushButton_ok">
-     <property name="text">
-      <string>OK</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>spinBox_size</tabstop>
+  <tabstop>checkBox_autoSize</tabstop>
+  <tabstop>comboBox_type</tabstop>
+  <tabstop>lineEdit_address</tabstop>
+  <tabstop>dialogButtonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
-   <sender>pushButton_cancel</sender>
-   <signal>clicked()</signal>
+   <sender>dialogButtonBox</sender>
+   <signal>accepted()</signal>
    <receiver>EditStringDialog</receiver>
-   <slot>reject()</slot>
+   <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>51</x>
@@ -124,10 +130,10 @@
    </hints>
   </connection>
   <connection>
-   <sender>pushButton_ok</sender>
-   <signal>clicked()</signal>
+   <sender>dialogButtonBox</sender>
+   <signal>rejected()</signal>
    <receiver>EditStringDialog</receiver>
-   <slot>accept()</slot>
+   <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>143</x>
diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
index 91b7541a..d9ea3e5d 100644
--- a/src/menus/DisassemblyContextMenu.cpp
+++ b/src/menus/DisassemblyContextMenu.cpp
@@ -248,7 +248,7 @@ void DisassemblyContextMenu::addSetAsMenu()
     initAction(&actionSetAsStringRemove, tr("Remove"),
                SLOT(on_actionSetAsStringRemove_triggered()));
     initAction(&actionSetAsStringAdvanced, tr("Advanced"),
-               SLOT(on_actionSetAsStringAdvanced_triggered()));
+               SLOT(on_actionSetAsStringAdvanced_triggered()), getSetAsStringAdvanced());
 
 
     setAsString->addAction(&actionSetAsStringAuto);
@@ -604,6 +604,10 @@ QKeySequence DisassemblyContextMenu::getSetAsStringSequence() const
     return {Qt::Key_A};
 }
 
+QKeySequence DisassemblyContextMenu::getSetAsStringAdvanced() const
+{
+	return {Qt::SHIFT + Qt::Key_A};
+}
 
 QKeySequence DisassemblyContextMenu::getSetToDataSequence() const
 {
diff --git a/src/menus/DisassemblyContextMenu.h b/src/menus/DisassemblyContextMenu.h
index cfe660eb..bfffe912 100644
--- a/src/menus/DisassemblyContextMenu.h
+++ b/src/menus/DisassemblyContextMenu.h
@@ -89,6 +89,7 @@ private:
     QKeySequence getCopyAddressSequence() const;
     QKeySequence getSetToCodeSequence() const;
     QKeySequence getSetAsStringSequence() const;
+    QKeySequence getSetAsStringAdvanced() const;
     QKeySequence getSetToDataSequence() const;
     QKeySequence getSetToDataExSequence() const;
     QKeySequence getAddFlagSequence() const;