diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
index bdfb6d8a2..e8172c855 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
@@ -71,6 +71,10 @@ public class BrowserQuickSearchWidget
     public static final String VALUE_HISTORY_DIALOGSETTING_KEY = BrowserQuickSearchWidget.class.getName()
         + ".valueHistory"; //$NON-NLS-1$
 
+    /** The Constant VALUE_PROPOSALS_DIALOGSETTING_KEY. */
+    public static final String VALUE_PROPOSALS_DIALOGSETTING_KEY = BrowserQuickSearchWidget.class.getName()
+        + ".valueProposals"; //$NON-NLS-1$
+
     /** The Constant ATTRIBUTE_HISTORY_DIALOGSETTING_KEY. */
     public static final String ATTRIBUTE_HISTORY_DIALOGSETTING_KEY = BrowserQuickSearchWidget.class.getName()
         + ".attributeHistory"; //$NON-NLS-1$
@@ -224,7 +228,9 @@ public void widgetDefaultSelected( SelectionEvent e )
 
         String[] values = HistoryUtils.load( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY );
         quickSearchValueCombo = BaseWidgetUtils.createCombo( innerComposite, values, -1, 1 );
-        quickSearchValuePP = new ListContentProposalProvider( values );
+        
+        String[] proposals = HistoryUtils.load( dialogSettings, VALUE_PROPOSALS_DIALOGSETTING_KEY );
+        quickSearchValuePP = new ListContentProposalProvider( proposals );
         new ExtendedContentAssistCommandAdapter( quickSearchValueCombo, new ComboContentAdapter(), quickSearchValuePP,
             null, null, true );
         quickSearchValueCombo.addSelectionListener( new SelectionAdapter()
@@ -295,11 +301,15 @@ private void performSearch()
         String[] attributes = HistoryUtils.load( dialogSettings, ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
         quickSearchAttributeCombo.setItems( attributes );
         quickSearchAttributeCombo.select( 0 );
+        
         HistoryUtils.save( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY, quickSearchValueCombo.getText() );
         String[] values = HistoryUtils.load( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY );
         quickSearchValueCombo.setItems( values );
         quickSearchValueCombo.select( 0 );
-        quickSearchValuePP.setProposals( Arrays.asList( values ) );
+        
+        HistoryUtils.save( dialogSettings, VALUE_PROPOSALS_DIALOGSETTING_KEY, quickSearchValueCombo.getText() );
+        String[] proposals = HistoryUtils.load( dialogSettings, VALUE_PROPOSALS_DIALOGSETTING_KEY );
+        quickSearchValuePP.setProposals( Arrays.asList( proposals ) );
 
         IBrowserConnection conn = entry.getBrowserConnection();