diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp
index 597554db..af96148b 100644
--- a/application/pages/LogPage.cpp
+++ b/application/pages/LogPage.cpp
@@ -108,6 +108,18 @@ void LogPage::on_trackLogCheckbox_clicked(bool checked)
 	m_write_active = checked;
 }
 
+void LogPage::on_wrapCheckbox_clicked(bool checked)
+{
+	if(checked)
+	{
+		ui->text->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+	}
+	else
+	{
+		ui->text->setWordWrapMode(QTextOption::WrapMode::NoWrap);
+	}
+}
+
 void LogPage::on_findButton_clicked()
 {
 	auto modifiers = QApplication::keyboardModifiers();
diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h
index ce89c3f2..9b694323 100644
--- a/application/pages/LogPage.h
+++ b/application/pages/LogPage.h
@@ -70,6 +70,7 @@ private slots:
 	void on_btnBottom_clicked();
 
 	void on_trackLogCheckbox_clicked(bool checked);
+	void on_wrapCheckbox_clicked(bool checked);
 
 	void on_findButton_clicked();
 	void findActivated();
diff --git a/application/pages/LogPage.ui b/application/pages/LogPage.ui
index b558ba36..bf5ec004 100644
--- a/application/pages/LogPage.ui
+++ b/application/pages/LogPage.ui
@@ -64,6 +64,16 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="wrapCheckbox">
+           <property name="text">
+            <string>Wrap lines</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@@ -152,6 +162,7 @@
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>trackLogCheckbox</tabstop>
+  <tabstop>wrapCheckbox</tabstop>
   <tabstop>btnCopy</tabstop>
   <tabstop>btnPaste</tabstop>
   <tabstop>btnClear</tabstop>