diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 963ea443..c48326ef 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -773,8 +773,9 @@ void MainWindow::executeQuery()
                 sqlWidget->getModel()->setQuery(queryPart);
                 if(sqlWidget->getModel()->valid())
                 {
-                    statusMessage = tr("%1 Rows returned from: %2 (took %3ms)").arg(
-                                sqlWidget->getModel()->totalRowCount()).arg(queryPart.trimmed()).arg(timer.elapsed());
+                    // The query takes the last placeholder as it may itself contain the sequence '%' + number
+                    statusMessage = tr("%1 Rows returned from: %3 (took %2ms)").arg(
+                                sqlWidget->getModel()->totalRowCount()).arg(timer.elapsed()).arg(queryPart.trimmed());
                     sqlWidget->enableSaveButton(true);
                     sql3status = SQLITE_OK;
                 }
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
index e33342ba..cd6a5417 100644
--- a/src/sqlitetablemodel.cpp
+++ b/src/sqlitetablemodel.cpp
@@ -377,7 +377,7 @@ void SqliteTableModel::fetchData(unsigned int from, unsigned to)
         if(queryTemp.contains(QRegExp("LIMIT\\s+.+\\s*((,|\\b(OFFSET)\\b)\\s*.+\\s*)?$", Qt::CaseInsensitive)))
             sLimitQuery = queryTemp;
         else
-            sLimitQuery = QString("%1 LIMIT %2, %3;").arg(queryTemp).arg(from).arg(to-from);
+            sLimitQuery = queryTemp + QString(" LIMIT %1, %2;").arg(from).arg(to-from);
     }
     m_db->logSQL(sLimitQuery, kLogMsg_App);
     QByteArray utf8Query = sLimitQuery.toUtf8();