diff --git a/src/ui/avatarbd/AvatarBDPragma.java b/src/ui/avatarbd/AvatarBDPragma.java
index 20387099980280afd91f1867a953ef3a0ade1a0b..12e507491d9613ca890ce94ac1b3e0e57cf9be00 100755
--- a/src/ui/avatarbd/AvatarBDPragma.java
+++ b/src/ui/avatarbd/AvatarBDPragma.java
@@ -121,7 +121,7 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
         removable = true;
 
         name = "Proverif Pragma";
-        value = "Proverif List of Pragma";
+        value = "";
 
         myImageIcon = IconManager.imgic6000;
     }
@@ -160,6 +160,8 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
         Color c = g.getColor();
 
         int desiredWidth = minWidth;
+	desiredWidth = Math.max(desiredWidth, g.getFontMetrics().stringWidth("Property Pragma") + marginX);
+	
         for(int i=0; i< values.length; i++) {
             desiredWidth = Math.max(desiredWidth, g.getFontMetrics().stringWidth(values[i]) + marginX);
         }
diff --git a/src/ui/window/JDialogPragma.java b/src/ui/window/JDialogPragma.java
index 8bb53ac74bbb570b72dbbac7c9473dbc9291d561..f0f336973ea9203fb21082b8678fcecbf743a482 100755
--- a/src/ui/window/JDialogPragma.java
+++ b/src/ui/window/JDialogPragma.java
@@ -88,7 +88,9 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
             popupMenu.setOpaque(false);
             popupMenu.setBorder(null);
             popupMenu.add(list = createSuggestionList(position, subWord), BorderLayout.CENTER);
+	    if (list.getModel().getSize() >0){
             popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0) + location.y);
+	    }
         }
 
         public void hide() {
@@ -141,7 +143,7 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
         }
 
         public void moveUp() {
-            int index = Math.min(list.getSelectedIndex() - 1, 0);
+            int index = Math.max(list.getSelectedIndex() - 1, 0);
             selectIndex(index);
         }
 
@@ -196,7 +198,7 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
             return;
         }
         final String subWord = text.substring(start, position);
-        if (subWord.length() < 2) {
+        if (subWord.length() < 1) {
             return;
         }
         suggestion = new SuggestionPanel(textarea, position, subWord, location);
@@ -258,11 +260,12 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
                     suggestion.moveDown();
                 } else if (e.getKeyCode() == KeyEvent.VK_UP && suggestion != null) {
                     suggestion.moveUp();
-                } else if (Character.isLetterOrDigit(e.getKeyChar())) {
-                    showSuggestionLater();
                 } else if (Character.isWhitespace(e.getKeyChar())) {
                     hideSuggestion();
                 }
+		else if (Character.isLetter(e.getKeyChar()) || e.getKeyChar()=='#'){
+                    showSuggestionLater();
+                }
             }
 
             @Override