diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
index 1ee03502..1b9e4319 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
@@ -4743,7 +4743,7 @@ private void cmdUploadDocumentActionPerformed(java.awt.event.ActionEvent evt) {/
         this.uploadDocument(null);
     }//GEN-LAST:event_cmdUploadDocumentActionPerformed
 
-    public void uploadDocument(Invoice invoice) {
+    public boolean uploadDocument(Invoice invoice) {
         JFileChooser chooser = new JFileChooser();
         chooser.setMultiSelectionEnabled(invoice == null);
 
@@ -4800,6 +4800,9 @@ public void uploadDocument(Invoice invoice) {
                 log.error("Error uploading document", ioe);
                 JOptionPane.showMessageDialog(this, "Fehler beim Laden der Datei: " + ioe.getMessage(), com.jdimension.jlawyer.client.utils.DesktopUtils.POPUP_TITLE_ERROR, JOptionPane.ERROR_MESSAGE);
             }
+            return true;
+        } else {
+            return false;
         }
     }
 
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.form
index c0a094f4..c7f2572c 100644
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.form
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.form
@@ -248,7 +248,7 @@
                       </Group>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="cmbCurrency" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="46" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java
index b8ac14fb..5a980611 100644
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java
@@ -2701,7 +2701,10 @@ private void cmdUploadInvoiceDocumentActionPerformed(java.awt.event.ActionEvent
             if (this.currentEntry != null) {
                 this.save();
             }
-            this.caseView.uploadDocument(currentEntry);
+            boolean uploaded=this.caseView.uploadDocument(currentEntry);
+            if(!uploaded)
+                return;
+            
             if (this.currentEntry != null) {
                 this.save();
                 try {