diff --git a/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp b/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp
index 063890240..dedeb420d 100644
--- a/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp
+++ b/omod/src/main/webapp/pages/conditionlist/manageConditions.gsp
@@ -77,9 +77,9 @@ ${ui.includeFragment("coreapps", "patientHeader", [patient: patient])}
                     </tr>
                     <tbody ng-repeat="conditionHistory in conditionHistoryList">
                     <tr class="clickable-tr" ng-init="condition = conditionHistory.conditions[0]"
-                        ng-show="condition.status===tab">
-                        <td ng-style="strikeThrough(condition.voided)">{{condition.concept.name}}</td>
-                        <td ng-style="strikeThrough(condition.voided)">{{formatDate(condition.onSetDate)}}</td>
+                        ng-show="condition.status===tab && condition.voided === false">
+                        <td>{{condition.concept.name}}</td>
+                        <td>{{formatDate(condition.onSetDate)}}</td>
                         <td ng-if="condition.status==='INACTIVE' && condition.voided===false" ng-style="strikeThrough(condition.voided)">{{formatDate(condition.endDate)}}</td>
                         <td ng-if="'${hasModifyConditionsPrivilege}'">
                             <i class="icon-plus-sign edit-action" title="${ui.message("coreapps.conditionui.active")}"
@@ -87,9 +87,7 @@ ${ui.includeFragment("coreapps", "patientHeader", [patient: patient])}
                             <i class="icon-minus-sign edit-action" title="${ui.message("coreapps.conditionui.inactive")}"
                                ng-click="deactivateCondition(condition)" ng-if="condition.status==='ACTIVE' && condition.voided===false"></i>
                             <i class="icon-remove delete-action" title="${ui.message("coreapps.coreapps.delete")}"
-                               ng-click="removeCondition(condition)" ng-if="condition.voided===false"></i>
-                            <i class="icon-undo delete-action" title="${ui.message("coreapps.conditionui.undo")}"
-                               ng-click="undoCondition(condition)" ng-if="condition.voided===true"></i>
+                               ng-click="conditionConfirmation(condition)" ng-if="condition.voided===false"></i>
                         </td>
                     </tr>
                     </tbody>
@@ -99,6 +97,22 @@ ${ui.includeFragment("coreapps", "patientHeader", [patient: patient])}
         </span>
     </div>
 
+    
+<div id="remove-condition-dialog" class="dialog" style="display: none; position: absolute; left: 35%; top:30%;">
+    <div class="dialog-header">
+        <h3>${ ui.message("coreapps.conditionui.removeCondition") }</h3>
+    </div>
+    <div class="dialog-content">
+        <ul>
+            <li class="info">
+                <span id="removeConditionMessage">${ ui.message("coreapps.conditionui.removeCondition.message","")}</span>
+            </li>
+        </ul>       
+            <button class="confirm right" type="submit" ng-click="removeCondition()">${ ui.message("general.yes") }</button>
+            <button class="cancel" ng-click="cancelDeletion()">${ ui.message("general.no") }</button>
+    </div>
+</div>
+
     <div class="actions">
         <button class="cancel"
                 onclick="location.href = '${ ui.encodeHtml(returnUrl) }'">${ui.message("coreapps.cancel")}</button>
diff --git a/omod/src/main/webapp/resources/scripts/conditionlist/controllers/manageconditions.controller.js b/omod/src/main/webapp/resources/scripts/conditionlist/controllers/manageconditions.controller.js
index 957a99a89..288bda8c7 100644
--- a/omod/src/main/webapp/resources/scripts/conditionlist/controllers/manageconditions.controller.js
+++ b/omod/src/main/webapp/resources/scripts/conditionlist/controllers/manageconditions.controller.js
@@ -7,6 +7,7 @@ ManageConditionsController.$inject = ['$scope', 'RestfulService', 'CommonFunctio
 function ManageConditionsController($scope, RestfulService, CommonFunctions) {
     var self = this;
     $scope.conditions = [];
+    $scope.conditionToBeRemoved =null;
     $scope.tabs = ["ACTIVE", "INACTIVE"];
 
     // this is required inorder to initialize the Restangular service
@@ -38,36 +39,50 @@ function ManageConditionsController($scope, RestfulService, CommonFunctions) {
             self.saveCondition(condition);
         }
 
-    self.removeCondition = self.removeCondition || function (condition) {
-            condition.voided = true;
-            condition.endDate = new Date();
-            self.saveCondition(condition);
-        }
-
-    self.undoCondition = self.undoCondition || function (condition) {
-            condition.voided = false;
-            condition.endDate = null;
-            self.saveCondition(condition);
+    self.removeCondition = self.removeCondition || function () {
+            $scope.conditionToBeRemoved.voided = true;
+            $scope.conditionToBeRemoved.endDate = new Date();
+            self.saveCondition($scope.conditionToBeRemoved); 
+            var dialog = document.getElementById("remove-condition-dialog");
+            dialog.style.display = "none";           
         }
+     
+    self.conditionConfirmation = self.conditionConfirmation || function(condition) {
+        var dialog = document.getElementById("remove-condition-dialog");
+        dialog.style.display = "block";
+        $scope.conditionToBeRemoved = condition;
+        var setText = document.getElementById("removeConditionMessage");
+        setText.innerHTML = "Are you sure you want to remove condition: <b>"+$scope.conditionToBeRemoved.concept.name+"</b> for this patient";
+    }    
+   
+    self.cancelDeletion = self.cancelDeletion || function(){
+        var dialog = document.getElementById("remove-condition-dialog");
+        dialog.style.display = "none";
+    }
 
     self.saveCondition = self.saveCondition || function (condition) {
             var conditions = [];
             conditions.push(condition);
             RestfulService.post('condition', conditions, function (data) {
+                if(condition.voided == false){
                 //emr.successAlert("conditionlist.updateCondition.success");
-                emr.successAlert("Condition Saved Successfully");
+                    emr.successAlert("Condition Saved Successfully");
+                }
+                else{
+                    emr.successAlert("Condition Deleted Successfully");
+                }
             }, function (error) {
                 //emr.errorAlert("conditionlist.updateCondition.error");
                 emr.errorAlert("Error Saving condition");
             });
-        }
+    }    
 
     // bind functions to scope
     $scope.removeCondition = self.removeCondition;
+    $scope.cancelDeletion = self.cancelDeletion;
     $scope.activateCondition = self.activateCondition;
     $scope.deactivateCondition = self.deactivateCondition;
-    $scope.undoCondition = self.undoCondition;
     $scope.formatDate = CommonFunctions.formatDate;
-    $scope.strikeThrough = CommonFunctions.strikeThrough;
     $scope.getConditions = self.getConditions;
+    $scope.conditionConfirmation = self.conditionConfirmation
 }
\ No newline at end of file