diff --git a/src/scintillaeditor.cpp b/src/scintillaeditor.cpp
index 71737c24..61ee004e 100644
--- a/src/scintillaeditor.cpp
+++ b/src/scintillaeditor.cpp
@@ -10,9 +10,10 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
   qsci = new QsciScintilla(this);
   scintillaLayout->setContentsMargins(0, 0, 0, 0);
   scintillaLayout->addWidget(qsci);
+
   qsci->setBraceMatching (QsciScintilla::SloppyBraceMatch);
-  qsci->setWrapMode(QsciScintilla::WrapWord);
-  qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByText, QsciScintilla::WrapFlagByText, 0);
+  qsci->setWrapMode(QsciScintilla::WrapCharacter);
+  qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByBorder, QsciScintilla::WrapFlagNone, 0);
   qsci->setAutoIndent(true);
   qsci->indicatorDefine(QsciScintilla::RoundBoxIndicator, indicatorNumber);
   qsci->markerDefine(QsciScintilla::Circle, markerNumber);
@@ -25,7 +26,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
   qsci->setCaretLineVisible(true);
   this->setHighlightScheme(preferenceEditorOption);	
 
-  connect(qsci, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
+  connect(qsci, SIGNAL(textChanged()), this, SIGNAL(contentsChanged()));
   connect(qsci, SIGNAL(modificationChanged(bool)), this, SIGNAL(modificationChanged(bool)));
 }
 
diff --git a/src/scintillaeditor.h b/src/scintillaeditor.h
index ed8b401a..a0fee05a 100644
--- a/src/scintillaeditor.h
+++ b/src/scintillaeditor.h
@@ -11,6 +11,7 @@
 
 class ScintillaEditor : public EditorInterface
 {
+	Q_OBJECT;
 public:
 	ScintillaEditor(QWidget *parent);
 	virtual ~ScintillaEditor() {}
@@ -45,9 +46,11 @@ public slots:
 	void cut();
 	void copy();
 	void paste();
-	void onTextChanged();
 	void initFont(const QString&, uint);
 
+private slots:
+	void onTextChanged();
+
 private:
 	QVBoxLayout *scintillaLayout;
 	static const int indicatorNumber = 1;