diff --git a/src/RemotePushDialog.cpp b/src/RemotePushDialog.cpp
index 53655fe8..2c810a27 100644
--- a/src/RemotePushDialog.cpp
+++ b/src/RemotePushDialog.cpp
@@ -42,6 +42,9 @@ void RemotePushDialog::checkInput()
     if(ui->editName->text().trimmed().isEmpty())
         valid = false;
 
+    if(ui->editCommitMessage->toPlainText().size() > 1024)
+        valid = false;
+
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
 }
 
diff --git a/src/RemotePushDialog.ui b/src/RemotePushDialog.ui
index af60604b..96951ebe 100644
--- a/src/RemotePushDialog.ui
+++ b/src/RemotePushDialog.ui
@@ -27,7 +27,11 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="editName"/>
+      <widget class="QLineEdit" name="editName">
+       <property name="maxLength">
+        <number>256</number>
+       </property>
+      </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_3">
@@ -172,6 +176,22 @@ p, li { white-space: pre-wrap; }
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>editCommitMessage</sender>
+   <signal>textChanged()</signal>
+   <receiver>RemotePushDialog</receiver>
+   <slot>checkInput()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>175</x>
+     <y>113</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>91</x>
+     <y>111</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>checkInput()</slot>