diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
index ae1703dd..92571516 100644
--- a/src/EditDialog.cpp
+++ b/src/EditDialog.cpp
@@ -141,7 +141,7 @@ void EditDialog::checkDataType()
 {
     // Check if data is text only
     ui->comboEditor->setVisible(true);
-    if(QString(hexEdit->data()).toLatin1() == hexEdit->data())     // Any proper way??
+    if(QString(hexEdit->data()).toUtf8() == hexEdit->data())     // Any proper way??
     {
         ui->editorStack->setCurrentIndex(0);
 
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
index 38b3cda7..9ad94994 100644
--- a/src/sqlitetablemodel.cpp
+++ b/src/sqlitetablemodel.cpp
@@ -436,6 +436,6 @@ void SqliteTableModel::clearCache()
 
 bool SqliteTableModel::isBinary(const QModelIndex& index) const
 {
-    QByteArray val = m_data.at(index.row()).at(index.column());
-    return val.size() > 1024 || val.contains('\0');     // Cheap BLOB test here...
+    QByteArray val = m_data.at(index.row()).at(index.column()).left(1024);
+    return val.contains('\0');     // Cheap BLOB test here...
 }