diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 931ab27dec9673aecc1c37375b718f73c61acc32..a8841260b60d6057642e2159e9ecd9f39aa0a8ee 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -742,14 +742,14 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
         case BreakpointEnabledRole:
             if (data->enabled != value.toBool()) {
                 toggleBreakpointEnabled(data);
-                layoutChanged();
+                emit layoutChanged();
             }
             return true;
 
         case BreakpointUseFullPathRole:
             if (data->useFullPath != value.toBool()) {
                 data->useFullPath = value.toBool();
-                layoutChanged();
+                emit layoutChanged();
             }
             return true;
 
@@ -757,21 +757,21 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
             QString val = value.toString();
             if (data->funcName != val) {
                 data->funcName = val;
-                layoutChanged();
+                emit layoutChanged();
             }
             return true;
 
             QString val = value.toString();
             if (data->fileName != val) {
                 data->fileName = val;
-                layoutChanged();
+                emit layoutChanged();
             }
             return true;
 
             QByteArray val = value.toString().toLatin1();
             if (data->lineNumber != val) {
                 data->lineNumber = val;
-                layoutChanged();
+                emit layoutChanged();
             }
             return true;
         */
@@ -779,7 +779,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
                 QByteArray val = value.toString().toLatin1();
                 if (val != data->condition) {
                     data->condition = val;
-                    layoutChanged();
+                    emit layoutChanged();
                 }
             }
             return true;
@@ -788,7 +788,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
                 QByteArray val = value.toString().toLatin1();
                 if (val != data->ignoreCount) {
                     data->ignoreCount = val;
-                    layoutChanged();
+                    emit layoutChanged();
                 }
             }
             return true;
@@ -797,7 +797,7 @@ bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int
                 QByteArray val = value.toString().toLatin1();
                 if (val != data->threadSpec) {
                     data->threadSpec = val;
-                    layoutChanged();
+                    emit layoutChanged();
                 }
             }
             return true;
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index ca73b14a59146025c328197e7589a50d88560da1..3a8c872436c816a0b3557dcfacc939dbabce890a 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -595,8 +595,10 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
     // Update breakpoints
     const QString functionName = info.functionName();
     const QString fileName = info.fileName();
-    const int lineNumber = byFunction? info.functionStartLineNumber() : info.lineNumber();
-    SDEBUG("checkForBreakCondition" << byFunction << functionName << lineNumber << fileName);
+    const int lineNumber = byFunction
+        ? info.functionStartLineNumber() : info.lineNumber();
+    SDEBUG("checkForBreakCondition" << byFunction << functionName
+        << lineNumber << fileName);
     if (m_stopOnNextLine) {
         // Interrupt inferior
         m_stopOnNextLine = false;
@@ -609,7 +611,11 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
         if (!data)
             return false;
 
-        // we just run into a breakpoint
+        // Skip disabled breakpoint.
+        if (!data->enabled)
+            return false;
+
+        // We just run into a breakpoint.
         //SDEBUG("RESOLVING BREAKPOINT AT " << fileName << lineNumber);
         data->bpLineNumber = QByteArray::number(lineNumber);
         data->bpFileName = fileName;