diff --git a/gui/common.h b/gui/common.h
index c4fd7c070..132f6b3db 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -48,6 +48,7 @@ ShowTypes;
 #define SETTINGS_CHECK_THREADS          "Check threads"
 #define SETTINGS_SHOW_FULL_PATH         "Show full path"
 #define SETTINGS_SHOW_NO_ERRORS         "Show no errors message"
+#define SETTINGS_SHOW_DEBUG_WARNINGS    "Show debug warnings"
 #define SETTINGS_SAVE_ALL_ERRORS        "Save all errors"
 #define SETTINGS_SAVE_FULL_PATH         "Save full path"
 #define SETTINGS_CHECK_DIALOG_WIDTH     "Check dialog width"
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index df9c96395..1f5a814b3 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -361,7 +361,7 @@ Settings MainWindow::GetCppcheckSettings()
     }
 
     result.debug = false;
-    result.debugwarnings = false;
+    result.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, 0).toBool();
     result._checkCodingStyle = true;
     result._errorsOnly = false;
     result._verbose = true;
diff --git a/gui/settings.ui b/gui/settings.ui
index 315264fe3..97c831249 100644
--- a/gui/settings.ui
+++ b/gui/settings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>589</width>
-    <height>274</height>
+    <height>281</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -61,6 +61,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="mShowDebugWarnings">
+           <property name="text">
+            <string>Show internal warnings in log</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
@@ -164,6 +171,22 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>mJobs</tabstop>
+  <tabstop>mForce</tabstop>
+  <tabstop>mShowFullPath</tabstop>
+  <tabstop>mShowNoErrorsMessage</tabstop>
+  <tabstop>mShowDebugWarnings</tabstop>
+  <tabstop>mListWidget</tabstop>
+  <tabstop>mButtonAdd</tabstop>
+  <tabstop>mButtonDelete</tabstop>
+  <tabstop>mButtonModify</tabstop>
+  <tabstop>mButtonDefault</tabstop>
+  <tabstop>mSaveAllErrors</tabstop>
+  <tabstop>mSaveFullPath</tabstop>
+  <tabstop>mButtons</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 713398cb6..93977beb3 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -46,7 +46,7 @@ SettingsDialog::SettingsDialog(QSettings *programSettings,
     mUI.mForce->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_CHECK_FORCE, false).toBool()));
     mUI.mShowFullPath->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_FULL_PATH, false).toBool()));
     mUI.mShowNoErrorsMessage->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_NO_ERRORS, false).toBool()));
-
+    mUI.mShowDebugWarnings->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool()));
 
     connect(mUI.mButtonAdd, SIGNAL(clicked()),
             this, SLOT(AddApplication()));
@@ -122,6 +122,7 @@ void SettingsDialog::SaveCheckboxValues()
     SaveCheckboxValue(mUI.mSaveFullPath, SETTINGS_SAVE_FULL_PATH);
     SaveCheckboxValue(mUI.mShowFullPath, SETTINGS_SHOW_FULL_PATH);
     SaveCheckboxValue(mUI.mShowNoErrorsMessage, SETTINGS_SHOW_NO_ERRORS);
+    SaveCheckboxValue(mUI.mShowDebugWarnings, SETTINGS_SHOW_DEBUG_WARNINGS);
 }
 
 void SettingsDialog::SaveCheckboxValue(QCheckBox *box, const QString &name)