diff --git a/app.pl b/app.pl
index 4e2aaba..82ea992 100755
--- a/app.pl
+++ b/app.pl
@@ -72,7 +72,7 @@ post '/paste' => sub {
     if (my $type = App::Spamfilter::is_spam($c, $who, $desc, $code)) {
         warn "I thought this was spam! $type";
     } else {
-        IRC::Perlbot::announce($c->param('chan'), $c->param('name'), $c->param('desc'), "https://perlbot.pl/pastebin/$id");
+        IRC::Perlbot::announce($c->param('chan'), $c->param('name'), substr($c->param('desc'), 0, 40), "https://perlbot.pl/pastebin/$id");
     }
 
     $c->redirect_to('/pastebin/'.$id);
diff --git a/templates/editor.html b/templates/editor.html
index 9bcc880..347de65 100755
--- a/templates/editor.html
+++ b/templates/editor.html
@@ -58,7 +58,7 @@
   </div>
   <div class="col-md-6">
     <label for="desc">What: </label>
-    <input size="40" name="desc" placeholder="I broke this" />
+    <input size="40" name="desc" placeholder="I broke this" maxlength="40"/>
     <input type="button" value="Show supported modules" id="showmodules" style="float:right"/>
   </div>
 </div>