diff --git a/mainwindow.cpp b/mainwindow.cpp
index 35a6e0f..5c4bdaa 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -87,6 +87,7 @@ MainWindow::MainWindow(QWidget *parent) :
     feedrate = settings.value("feedrate", 1500).toInt();
     extruderFeedrate = settings.value("extruderfeedrate", 200).toInt();
     trayIconEnabled = settings.value("core/trayiconenabled", 1).toBool();
+    supressWait = settings.value("user/supresswait", 0).toBool();
     int size = settings.beginReadArray("user/recentfiles");
     for(int i = 0; i < size; ++i)
     {
@@ -603,6 +604,7 @@ void MainWindow::readSerial(QByteArray data)
 
 void MainWindow::printMsg(QString text)
 {
+    if(supressWait && text.startsWith("wait")) return;
     //Get the cursor and set it to the end
     QTextCursor cursor = ui->terminal->textCursor();
     cursor.movePosition(QTextCursor::End);
diff --git a/mainwindow.h b/mainwindow.h
index 233c407..5e44ff8 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -77,6 +77,7 @@ private:
     bool echo;
     bool chekingSDStatus;
     bool trayIconEnabled;
+    bool supressWait;
     int firmware;
     int feedrate;
     int extruderFeedrate;
diff --git a/settingswindow.cpp b/settingswindow.cpp
index e13d24b..0984411 100644
--- a/settingswindow.cpp
+++ b/settingswindow.cpp
@@ -25,6 +25,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
     ui->checksumbox->setChecked(settings.value("core/checksums", 0).toBool());
     ui->sdbox->setChecked(settings.value("core/checksdstatus", 1).toBool());
     ui->dtrbox->setChecked(settings.value("core/dtr", 1).toBool());
+    ui->supresswaitbox->setChecked(settings.value("user/supresswait").toBool());
 
     ui->firmwarecombo->addItem("Marlin"); //0
     ui->firmwarecombo->addItem("Repetier"); //1
@@ -60,6 +61,7 @@ void SettingsWindow::on_buttonBox_accepted()
     settings.setValue("core/checksdstatus", ui->sdbox->isChecked());
     settings.setValue("core/dtr", ui->dtrbox->isChecked());
     settings.setValue("printer/firmware", ui->firmwarecombo->currentIndex());
+    settings.setValue("user/supresswait", ui->supresswaitbox->isChecked());
 
     emit updatesettings();
 }
diff --git a/settingswindow.ui b/settingswindow.ui
index f155e87..bbad3f6 100644
--- a/settingswindow.ui
+++ b/settingswindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>483</width>
-    <height>341</height>
+    <width>484</width>
+    <height>357</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -59,6 +59,13 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>ms</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="senderbox">
         <property name="toolTip">
@@ -100,10 +107,10 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="label_3">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>ms</string>
+         <string>Status</string>
         </property>
        </widget>
       </item>
@@ -117,6 +124,13 @@
         </property>
        </widget>
       </item>
+      <item row="8" column="0" colspan="3">
+       <widget class="QCheckBox" name="sdbox">
+        <property name="text">
+         <string>Check SD printing status</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0" colspan="3">
        <widget class="QLabel" name="label_7">
         <property name="minimumSize">
@@ -139,20 +153,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Status</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0" colspan="3">
-       <widget class="QCheckBox" name="sdbox">
-        <property name="text">
-         <string>Check SD printing status</string>
-        </property>
-       </widget>
-      </item>
       <item row="7" column="0" colspan="3">
        <widget class="QCheckBox" name="lockbox">
         <property name="text">
@@ -173,6 +173,13 @@
         </property>
        </widget>
       </item>
+      <item row="10" column="0" colspan="2">
+       <widget class="QCheckBox" name="supresswaitbox">
+        <property name="text">
+         <string>Supress &quot;wait&quot; responce</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>