diff --git a/doc/ChangeLog b/doc/ChangeLog
index 09723645d..145c64b24 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,10 @@
 	* FirewallCodeViewer.cpp (FirewallCodeViewer::fileSelected): now 
 	when viewing again file that was viewed before scroll position is
 	same as user left it.
+	* instDialog_q.ui: renames "All" button to "Select all" and "None"
+	to "Select none"
+	* instDialog.cpp (instDialog::show): hide "Select all" and "Select none"
+	buttons when there is only one firewall in list
 
 2010-07-05  Roman Bovsunivskiy <a2k0001@gmail.com>
 	
diff --git a/src/gui/instDialog.cpp b/src/gui/instDialog.cpp
index af09891a0..d49b7610d 100644
--- a/src/gui/instDialog.cpp
+++ b/src/gui/instDialog.cpp
@@ -246,6 +246,9 @@ void instDialog::show(ProjectPanel *proj,
     if (clusters.size() >= 1)  // even one cluster enables batch install btn
         m_dialog->batchInstall->setEnabled(true);
 
+    if (firewalls.size() + clusters.size() == 1)
+        m_dialog->selectAllNoneFrame->hide();
+
     m_dialog->batchInstall->setChecked(false);
 
     creatingTable = false;
diff --git a/src/gui/instdialog_q.ui b/src/gui/instdialog_q.ui
index 8502beebe..be00963f8 100644
--- a/src/gui/instdialog_q.ui
+++ b/src/gui/instdialog_q.ui
@@ -163,7 +163,7 @@
            </property>
            <layout class="QGridLayout" name="gridLayout">
             <item row="1" column="0">
-             <widget class="QFrame" name="frame14">
+             <widget class="QFrame" name="selectAllNoneFrame">
               <property name="frameShape">
                <enum>QFrame::Box</enum>
               </property>
@@ -193,14 +193,14 @@
                <item row="0" column="0">
                 <widget class="QPushButton" name="pushButton16">
                  <property name="text">
-                  <string>All</string>
+                  <string>Select all</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QPushButton" name="pushButton17">
                  <property name="text">
-                  <string>None</string>
+                  <string>Select none</string>
                  </property>
                 </widget>
                </item>