diff --git a/Src/LineFiltersDlg.cpp b/Src/LineFiltersDlg.cpp
index 225de79efaa..f7d829a49d3 100644
--- a/Src/LineFiltersDlg.cpp
+++ b/Src/LineFiltersDlg.cpp
@@ -55,6 +55,7 @@ BEGIN_MESSAGE_MAP(LineFiltersDlg, CTrPropertyPage)
 	ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
 	ON_NOTIFY(LVN_KEYDOWN, IDC_LFILTER_LIST, OnLvnKeyDownLfilterList)
 	ON_NOTIFY(LVN_ENDLABELEDIT, IDC_LFILTER_LIST, OnEndLabelEditLfilterList)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_LFILTER_LIST, OnLvnItemChangedLfilterList)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -70,7 +71,8 @@ BOOL LineFiltersDlg::OnInitDialog()
 	CTrPropertyPage::OnInitDialog();
 
 	InitList();
-	
+	SetButtonState();
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -236,3 +238,32 @@ void LineFiltersDlg::OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
 {
 	*pResult = 1;
 }
+
+/**
+ * @brief Called when item state is changed.
+ *
+ * Disable "Edit" and "Remove" buttons when no item is selected.
+ * @param [in] pNMHDR Listview item data.
+ * @param [out] pResult Result of the action is returned in here.
+ */
+void LineFiltersDlg::OnLvnItemChangedLfilterList(NMHDR* pNMHDR, LRESULT* pResult)
+{
+	LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+	if ((pNMLV->uOldState & LVIS_SELECTED) != (pNMLV->uNewState & LVIS_SELECTED))
+	{
+		SetButtonState();
+	}
+	*pResult = 0;
+}
+
+/**
+ * @brief Disable "Edit" and "Remove" buttons when no item is selected.
+ */
+void LineFiltersDlg::SetButtonState()
+{
+	int sel = -1;
+	sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+	bool bIsSelected = (sel != -1);
+	EnableDlgItem(IDC_LFILTER_EDITBTN, bIsSelected);
+	EnableDlgItem(IDC_LFILTER_REMOVEBTN, bIsSelected);
+}
diff --git a/Src/LineFiltersDlg.h b/Src/LineFiltersDlg.h
index 8b68cfff22d..f079da6d3d3 100644
--- a/Src/LineFiltersDlg.h
+++ b/Src/LineFiltersDlg.h
@@ -52,6 +52,7 @@ class LineFiltersDlg : public CTrPropertyPage
 	afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnLvnItemChangedLfilterList(NMHDR* pNMHDR, LRESULT* pResult);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
@@ -63,4 +64,6 @@ class LineFiltersDlg : public CTrPropertyPage
 	CListCtrl m_filtersList; /**< List control having filter strings */
 
 	LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
+
+	void SetButtonState();
 };