diff --git a/modules/qi-core/src/main/java/org/jpos/qi/QIEntityView.java b/modules/qi-core/src/main/java/org/jpos/qi/QIEntityView.java
index a3ef1cfc44..e492cdc0c6 100644
--- a/modules/qi-core/src/main/java/org/jpos/qi/QIEntityView.java
+++ b/modules/qi-core/src/main/java/org/jpos/qi/QIEntityView.java
@@ -358,12 +358,12 @@ public void setReadOnly (boolean readOnly) {
 
         if (canEdit()) {
             footer.addComponent(editBtn);
-            footer.addComponent(saveBtn);
-            footer.addComponent(cancelBtn);
             footer.setComponentAlignment(editBtn, Alignment.MIDDLE_RIGHT);
-            footer.setComponentAlignment(saveBtn, Alignment.MIDDLE_RIGHT);
-            footer.setComponentAlignment(cancelBtn, Alignment.MIDDLE_RIGHT);
         }
+        footer.addComponent(saveBtn);
+        footer.addComponent(cancelBtn);
+        footer.setComponentAlignment(saveBtn, Alignment.MIDDLE_RIGHT);
+        footer.setComponentAlignment(cancelBtn, Alignment.MIDDLE_RIGHT);
         if (canRemove()) {
             footer.addComponent(removeBtn);
             footer.setComponentAlignment(removeBtn, Alignment.MIDDLE_RIGHT);