diff --git a/alethzero/Main.ui b/alethzero/Main.ui
index d3f027ac1..0a727e505 100644
--- a/alethzero/Main.ui
+++ b/alethzero/Main.ui
@@ -185,7 +185,7 @@
     <addaction name="killBlockchain"/>
     <addaction name="inject"/>
     <addaction name="forceMining"/>
-    <addaction name="disableCompilerOptimization"/>
+    <addaction name="optimizeCompiler"/>
    </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Network"/>
@@ -1668,12 +1668,12 @@ font-size: 14pt</string>
     <string>&amp;Refresh</string>
    </property>
   </action>
-  <action name="disableCompilerOptimization">
+  <action name="optimizeCompiler">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Disable LLL Compiler Optimization</string>
+    <string>&amp;Optimize LLL Compiler</string>
    </property>
   </action>
  </widget>
diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 19ce70587..dd12236e4 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -332,9 +332,9 @@ void Main::on_forceMining_triggered()
 	m_client->setForceMining(ui->forceMining->isChecked());
 }
 
-void Main::on_disableCompilerOptimization_triggered()
+void Main::on_optimizeCompiler_triggered()
 {
-	m_disableCompilerOptimization = ui->disableCompilerOptimization->isChecked();
+	m_optimizeCompiler = ui->optimizeCompiler->isChecked();
 	on_data_textChanged();
 }
 
@@ -576,6 +576,7 @@ void Main::readSettings(bool _skipGeometry)
 	ui->paranoia->setChecked(s.value("paranoia", false).toBool());
 	ui->showAll->setChecked(s.value("showAll", false).toBool());
 	ui->showAllAccounts->setChecked(s.value("showAllAccounts", false).toBool());
+	ui->optimizeCompiler->setChecked(m_optimizeCompiler);
 	ui->clientName->setText(s.value("clientName", "").toString());
 	ui->idealPeers->setValue(s.value("idealPeers", ui->idealPeers->value()).toInt());
 	ui->port->setValue(s.value("port", ui->port->value()).toInt());
@@ -1308,7 +1309,7 @@ void Main::on_data_textChanged()
 		}
 		else
 		{
-			m_data = eth::compileLLL(src, !m_disableCompilerOptimization, &errors);
+			m_data = eth::compileLLL(src, m_optimizeCompiler, &errors);
 			if (errors.size())
 			{
 				try
@@ -1326,7 +1327,8 @@ void Main::on_data_textChanged()
 			{
 				auto asmcode = eth::compileLLLToAsm(src, false);
 				lll = "<h4>Pre</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>";
-				if (!m_disableCompilerOptimization) {
+				if (m_optimizeCompiler)
+				{
 					asmcode = eth::compileLLLToAsm(src, true);
 					lll = "<h4>Opt</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>" + lll;
 				}
diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h
index 98b4a2c03..fc12a567e 100644
--- a/alethzero/MainWin.h
+++ b/alethzero/MainWin.h
@@ -138,7 +138,7 @@ private slots:
 	void on_debugDumpState_triggered(int _add = 1);
 	void on_debugDumpStatePre_triggered();
 	void on_refresh_triggered();
-	void on_disableCompilerOptimization_triggered();
+	void on_optimizeCompiler_triggered();
 
 signals:
 	void poll();
@@ -222,7 +222,7 @@ private:
 	QMap<unsigned, unsigned> m_pcWarp;
 	QList<WorldState> m_history;
 	std::map<eth::u256, eth::bytes> m_codes;	// and pcWarps
-	bool m_disableCompilerOptimization = false;
+	bool m_optimizeCompiler = true;
 
 	QNetworkAccessManager m_webCtrl;