diff --git a/pcusb.db b/pcusb.db
index 3382fa3..c547099 100644
Binary files a/pcusb.db and b/pcusb.db differ
diff --git a/src/main/java/se/lantz/model/InfoModel.java b/src/main/java/se/lantz/model/InfoModel.java
index 6a0b554..bfad4cc 100644
--- a/src/main/java/se/lantz/model/InfoModel.java
+++ b/src/main/java/se/lantz/model/InfoModel.java
@@ -59,7 +59,9 @@ public class InfoModel extends AbstractModel
   public void setDescription(String description)
   {
     String old = getDescription();
-    this.description = description;
+    //Replace all double spaces, tabs and newlines
+    this.description = description.replaceAll("\\s\\s+", " ");
+    this.description = this.description.replace("\t", " ");
     if (!Objects.equals(old, description))
     {
       notifyChange();