diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index 1a8ff00..4381794 100644
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -48,6 +48,7 @@
 BEGIN_EVENT_TABLE(frmImport, pgDialog)
 	EVT_COMBOBOX(XRCID("cbFormat"),   frmImport::OnChangeFormat)
 	EVT_BUTTON(wxID_OK,               frmImport::OnOK)
+	EVT_BUTTON (wxID_HELP,            frmImport::OnHelp)
 END_EVENT_TABLE()
 
 
@@ -138,14 +139,11 @@ frmImport::~frmImport()
 }
 
 
-wxString frmImport::GetHelpPage() const
+void frmImport::OnHelp(wxCommandEvent &ev)
 {
-	wxString page;
-	page = wxT("pg/sql-copy");
-	return page;
+	DisplayHelp(wxT("sql-copy"), HELP_POSTGRESQL);
 }
 
-
 void frmImport::OnChangeFormat(wxCommandEvent &ev)
 {
 	bool enabled = cbFormat->GetValue() == wxT("csv");
@@ -200,6 +198,13 @@ void frmImport::OnOK(wxCommandEvent &ev)
 			}
 		}
 
+		//Check at least one column should be selected else raise warning
+		if(!allColumnsToImport && columnsToImport.Length() <= 0)
+		{
+			wxMessageBox(_("Please, select at least one column to import."), _("Import"), wxICON_WARNING | wxOK, this);
+			return;
+		}
+
 		// Build COPY query
 		query = wxT("COPY ") + object->GetSchema()->GetQuotedIdentifier() + wxT(".") + object->GetQuotedIdentifier();
 		if (!allColumnsToImport)
diff --git a/pgadmin/include/frm/frmImport.h b/pgadmin/include/frm/frmImport.h
index 6fa5bf8..3561980 100644
--- a/pgadmin/include/frm/frmImport.h
+++ b/pgadmin/include/frm/frmImport.h
@@ -25,7 +25,7 @@ public:
 	~frmImport();
 
 private:
-	wxString GetHelpPage() const;
+	void OnHelp(wxCommandEvent &ev);
 	void OnSelectFilename(wxCommandEvent &ev);
 	void OnChangeFormat(wxCommandEvent &ev);
 	void OnOK(wxCommandEvent &ev);