diff --git a/src/keepass2android/services/CopyToClipboardService.cs b/src/keepass2android/services/CopyToClipboardService.cs
index c1e636f8..205cbd21 100644
--- a/src/keepass2android/services/CopyToClipboardService.cs
+++ b/src/keepass2android/services/CopyToClipboardService.cs
@@ -647,14 +647,24 @@ namespace keepass2android
 			public override void Run()
 			{
 				String currentClip = Util.GetClipboard(_service);
-				_handler.Post(DoClearClipboard);
+				DoPostClear();
 				if (currentClip.Equals(_clearText))
 				{
-					Util.CopyToClipboard(_service, "");
-					_handler.Post(ShowClipboardWarning);
+				    Util.CopyToClipboard(_service, "");
+				    DoPostWarn();
 				}
 			}
 
+		    private void DoPostWarn()
+		    {
+		        _handler.Post(ShowClipboardWarning);
+		    }
+
+		    private void DoPostClear()
+		    {
+		        _handler.Post(DoClearClipboard);
+		    }
+
 		    private void DoClearClipboard()
 		    {
 		        _service.OnWaitElementDeleted(CopyToClipboardService.ClearClipboard);